commit e2c979b76b08c398ba5478b32ea9a0d875c5259e
Merge: 9fa8724 643b709
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 23:15:37 2012 +0000

    Merge "Allows docs to be built on RTFD.org"

commit 643b7094b2ecd02d970e5114dec3e7cf44174f61
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Mar 15 17:59:44 2012 -0500

    Allows docs to be built on RTFD.org
    
    * Makes me happy.
    
    Change-Id: I01f4d5b13986255aa0f5572de028cc07ce116363

 doc/source/conf.py   |   10 +++++-----
 doc/source/index.rst |    4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

commit 9fa87241df290becc2d9eedb1ca03bd1a2f203c8
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Thu Mar 15 10:59:02 2012 -0500

    Letting allocated_ip_address filter by address
    
    For Nova to filter instances by ip address we need
    a way for melange to return an address without
    being scoped by tenant.
    
    Change-Id: I9a9cddd4b86a562ac6610179776d0cdf41f1c044

 melange/ipam/service.py                 |    3 ++-
 melange/tests/unit/test_ipam_service.py |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

commit aa76fce9aaa22ab11a7b472afc9ba0f7b4235065
Author: Peng Yong <ppyy@pubyun.com>
Date:   Sun Mar 11 23:44:15 2012 +0800

    check connection in Listener. refer to Bug #943031
    
    Change-Id: I9fd064d7a9e953ea7d958982c483ccc358dbf7fa

 Authors                          |    1 +
 melange/db/sqlalchemy/session.py |   33 +++++++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

commit ae0ceea3e9fe72bfc2872b28480f14be022777c0
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Mar 9 11:17:43 2012 +0000

    Update to latest openstack-common
    
    Simply by running:
    
      $> cd openstack-common
      $> python update.py ../melange
    
    We should do this more often.
    
    Change-Id: I07ac084a14283c38ed39ecb9535436b96365bda8

 melange/openstack/common/config.py |   28 ++++++++++++++--------------
 melange/openstack/common/setup.py  |   32 +++++++++++++++++++-------------
 melange/openstack/common/utils.py  |   33 +++++++++++++++++++++++++--------
 melange/openstack/common/wsgi.py   |    8 ++++----
 tools/pip-requires                 |    1 +
 5 files changed, 63 insertions(+), 39 deletions(-)

commit 01cb899ef7a371f4f8494903f93a783f85fd1a09
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Feb 29 10:14:15 2012 -0600

    Promote v1.0 to current
    
    * Mark v0.1 as deprecated
    * Add v1.0 to version list
    * Use subclasses for wsgi Routers
    * Add melange-manage route command to print routes
    * Fixes certain routes not being exposed in the v1.0 api (LP947327)
    
    Change-Id: Iac8294f2534decbbddf53230386fdbe8c622ff84

 bin/melange-manage                  |   15 +++-
 melange/ipam/service.py             |  191 +++++++++++++++++------------------
 melange/tests/unit/test_versions.py |   19 +++-
 melange/versions.py                 |    3 +-
 4 files changed, 125 insertions(+), 103 deletions(-)

commit b69e9db4c1c2faf7d9bc47392135da543f1013d6
Author: Hengqing Hu <hudayou@hotmail.com>
Date:   Sat Mar 3 12:55:25 2012 +0800

    Remove trailing whitespaces in regular file
    
    Change-Id: I57863b354b38dd6618e4dfa9c27f0a107e244526

 Authors                            |    1 +
 doc/source/_static/jquery.tweet.js |    6 ++--
 doc/source/apidoc.rst              |   40 ++++++++++++++++++------------------
 tools/rfc.sh                       |    2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)

commit a2ffd46412b225f93b801c029d48168b9d799191
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Feb 29 17:33:06 2012 -0600

    Add the tenant_id to the block data
    
    Change-Id: I72f9d3670bb5469eb09acd971dbc2d6acb9aabf7

 melange/ipam/views.py                 |    1 +
 melange/tests/unit/test_ipam_views.py |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

commit 45da662385efe0e6bedfa730f43c9738fab5782d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 6 08:35:10 2012 -0500

    Add tox config for multi-python testing.
    
    Change-Id: I9fdcb44cfe7859a53726c7235ea2b395e0d48160

 tox.ini |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

commit d50ce37a2118067eb666a5e5a8fa722366928d2b
Merge: a6bd529 ea21289
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 21 15:39:24 2012 +0000

    Merge "Fixes typo in plugin migration paths"

commit ea212892db1ec9e6fb9ab5404c9480881e943455
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Feb 20 22:07:02 2012 +0530

    Fixes typo in plugin migration paths
    
    Change-Id: I83e5c1b342bcf25fb69235b8c4673e64375e11d9

 bin/melange-manage |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit a6bd529094f6dd8a84daf628ef7973125a03cc3e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Feb 15 05:44:56 2012 +0530

    Docs for API introduced due to bluepring interface-api-cleanup.
    
    Change-Id: Iee2db906d154a44bbdc369f04c745e29aeb469e3

 doc/source/apidoc.rst |  238 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 238 insertions(+), 0 deletions(-)

commit fe4b075c152cc8b813c0cc704ca0475c6d811c86
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Feb 10 18:51:21 2012 +0530

    New APIs as per blueprint interface-api-cleanup
    
    Also defines the 1.0 API that doesnt contain the old apis of 0.1 that we plan
    to remove
    
    Change-Id: I3aed4fcfefc07af7026f94ae62d4e842d6145007

 etc/melange/melange.conf.sample         |   17 ++-
 melange/ipam/models.py                  |   14 ++
 melange/ipam/service.py                 |  282 ++++++++++++++++++++-----------
 melange/tests/unit/__init__.py          |    2 +-
 melange/tests/unit/test_extensions.py   |    4 +-
 melange/tests/unit/test_ipam_service.py |  224 ++++++++++++++++++++++++-
 6 files changed, 434 insertions(+), 109 deletions(-)

commit ddca7833094cdab57129a9d30705331f06e25840
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Tue Feb 14 10:42:00 2012 -0600

    fixes a pep8 error
    
    This does not appear to change the functionality
    of the file, just keeps it from angering pep8.
    
    update: Kolker's suggestion
    
    Change-Id: I6197e934e537746c9baa6a30c74c9e2df1d49836

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c318aa746730a262a5a882640ff291018646e278
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Feb 8 17:56:25 2012 +0530

    Allows pluggable algorithms for address generation.
    
    Addresses blueprint scalability by extracting out ip/mac addresss generation
    into separate pluggable components. Allows the address generator plugins to
    create their own models and database tables.
    
    Change-Id: If85b6c73d1e30c92f0e2ea80fea028813d612cb8

 bin/melange-delete-deallocated-ips                 |   21 +---
 bin/melange-manage                                 |   12 +-
 bin/melange-server                                 |    4 +-
 etc/melange/melange.conf.sample                    |   18 ++--
 melange/common/config.py                           |    9 ++
 melange/common/messaging.py                        |   35 +++++--
 melange/common/notifier.py                         |    2 +-
 melange/db/sqlalchemy/api.py                       |   35 +++++--
 melange/db/sqlalchemy/mappers.py                   |   17 +++-
 melange/db/sqlalchemy/migration.py                 |   38 ++++----
 melange/db/sqlalchemy/session.py                   |    5 +-
 melange/ipam/models.py                             |  105 +++++++++-----------
 melange/ipv4/__init__.py                           |   24 ++++-
 melange/ipv4/db_based_ip_generator.py              |   47 ---------
 melange/ipv4/db_based_ip_generator/__init__.py     |   36 +++++++
 melange/ipv4/db_based_ip_generator/generator.py    |   51 ++++++++++
 melange/ipv4/db_based_ip_generator/mapper.py       |   32 ++++++
 melange/ipv4/db_based_ip_generator/models.py       |   22 ++++
 melange/ipv4/queue_based_ip_generator.py           |   32 ------
 melange/mac/__init__.py                            |   40 ++++++++
 melange/mac/db_based_mac_generator/__init__.py     |   34 +++++++
 melange/mac/db_based_mac_generator/generator.py    |   46 +++++++++
 melange/mac/db_based_mac_generator/mapper.py       |   32 ++++++
 melange/mac/db_based_mac_generator/models.py       |   22 ++++
 melange/tests/factories/models.py                  |   10 --
 melange/tests/functional/__init__.py               |   14 +--
 melange/tests/functional/test_cli.py               |    2 +-
 .../functional/test_ipv4_queue_based_generator.py  |   58 -----------
 melange/tests/unit/__init__.py                     |    6 +-
 melange/tests/unit/ipv4/__init__.py                |   16 +++
 .../unit/ipv4/db_based_ip_generator/__init__.py    |   16 +++
 .../unit/ipv4/db_based_ip_generator/factories.py   |   34 +++++++
 .../test_db_based_ip_generator.py                  |   80 +++++++++++++++
 melange/tests/unit/test_db_based_mac_generator.py  |   56 +++++++++++
 melange/tests/unit/test_ipam_models.py             |   73 +++-----------
 melange/tests/unit/test_ipv6.py                    |    8 +-
 melange/tests/unit/test_messaging.py               |   16 ++--
 melange/tests/unit/test_notifier.py                |    9 +-
 tools/pip-requires                                 |    2 +-
 39 files changed, 750 insertions(+), 369 deletions(-)

commit d972581d1b799b16dcdfe09ac9f80c35635a7f8d
Merge: 0561206 b7edf8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 9 21:41:33 2012 +0000

    Merge "Do not assume that a gateway is needed"

commit b7edf8ca88d3fc5ae0d314e26c54cb8ca8f07ab5
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Feb 9 10:53:28 2012 -0600

    Do not assume that a gateway is needed
    
    If a gateway isn't specified one should not be inserted automatically
    
    Change-Id: I64e02914271bd017062cda156ae711f35896d7f0

 .gitignore                             |    1 +
 melange/ipam/models.py                 |    3 --
 melange/tests/unit/test_ipam_models.py |   48 ++++++++++++++++++++-----------
 3 files changed, 32 insertions(+), 20 deletions(-)

commit 05612066e9ed6db67a0f0d5e56df175d4421750b
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Feb 9 11:27:02 2012 -0600

    Fix namespace declaration
    
    melange/__init__.py may not exist depending on order of installation.
    
    Change-Id: I875152afbd691e221414ef700371317730237506

 .gitignore                              |    1 +
 bin/melange-delete-deallocated-ips      |    8 +++++++-
 bin/melange-manage                      |   10 +++++++---
 bin/melange-server                      |    9 +++++++--
 melange/__init__.py                     |   27 +++++----------------------
 melange/common/__init__.py              |    3 +++
 melange/tests/__init__.py               |   25 ++++++++++++++++++++++++-
 melange/tests/functional/__init__.py    |   10 +++-------
 melange/tests/functional/test_cli.py    |    8 ++++----
 melange/tests/unit/__init__.py          |   13 ++-----------
 melange/tests/unit/test_extensions.py   |    4 ++--
 melange/tests/unit/test_ipam_service.py |    3 +--
 melange/tests/unit/test_versions.py     |    3 +--
 setup.py                                |    4 +++-
 14 files changed, 70 insertions(+), 58 deletions(-)

commit b4707d28eaf9f843dadc6613c9d4061416bdb385
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 8 01:29:05 2012 -0500

    Added logging to select areas of melange.
    
    The biggest change here is that now by default SQLAlchemy will
    not echo every query. This can still be turned on, but it is very
    verbose. More specific log lines should be added for debugging after
    this change.
    
    Change-Id: Ia51933d268412ae61cf2df8c355c0fa1b365d57f

 melange/common/auth.py           |   17 ++++++++++++++---
 melange/common/messaging.py      |   17 +++++++++++++----
 melange/db/sqlalchemy/session.py |   18 +++++++++++++++---
 melange/ipam/models.py           |   11 +++++++++++
 melange/ipam/service.py          |   13 +++++++++++++
 5 files changed, 66 insertions(+), 10 deletions(-)

commit a5b116b6fb5702bd140b89ec2f714a392e7f564f
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Feb 7 10:06:49 2012 -0800

    Move changelog writing to openstack.common.
    
    Change-Id: I8627efcc1ee74fa62d1dd1b5dc419c3c031d0175

 melange/openstack/common/setup.py |    9 +++++++++
 setup.py                          |   12 ++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

commit 73b57265598c148c8028a1f4f1cc77001de32865
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 6 07:15:41 2012 -0800

    Let openstack.common handle write_vcsversion().
    
    Change-Id: Id2c494a304fac1b69c1514ac90865b27f49e9881

 melange/openstack/common/setup.py |   25 +++++++++++++++++++++++++
 setup.py                          |   33 +++++----------------------------
 tox.ini                           |    1 +
 3 files changed, 31 insertions(+), 28 deletions(-)

commit 420e8836a519f680b41961f056aab1b34aa0de59
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 6 08:35:10 2012 -0500

    Add tox config for multi-python testing.
    
    Change-Id: I59ba68ae7fd9d92bd914716a8bdd14d702fd38b0

 .gitignore            |    3 +++
 MANIFEST.in           |    2 ++
 builddeb.sh           |   20 --------------------
 setup.cfg             |   12 ++++++++++++
 setup.py              |   12 ++++++++++++
 tools/install_venv.py |    6 ++++--
 tools/pip-requires    |    5 -----
 tools/test-requires   |    9 +++++++++
 tox.ini               |   37 +++++++++++++++++++++++++++++++++++++
 9 files changed, 79 insertions(+), 27 deletions(-)

commit 20f8c556300fa5f77462c7ad0abe06dea916b32a
Merge: 379ef4a 487159d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 7 05:38:20 2012 +0000

    Merge "Fixes LP925656"

commit 379ef4a69bd1c8445081019c66ccdd03b9fdd87c
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Feb 6 08:45:57 2012 -0500

    Update setup split from openstack-common.
    
    Change-Id: I5cc8ef729b6ff0c85e57fa00c1c994038f2c8600

 melange/openstack/common/setup.py |   87 +++++++++++++++++++++++++++++++++++++
 melange/openstack/common/utils.py |   18 --------
 openstack-common.conf             |    2 +-
 setup.py                          |   16 +------
 4 files changed, 90 insertions(+), 33 deletions(-)

commit 487159df99d8c7e302da761ff33edab64a3a722b
Author: Troy Toman <troy.toman@rackspace.com>
Date:   Thu Feb 2 13:53:38 2012 -0600

    Fixes LP925656
    
    Change-Id: I8ede34610bf16206544a7f48409715d036bde976

 doc/source/apidoc.rst                  |    2 +-
 melange/ipam/models.py                 |    5 ++++-
 melange/tests/unit/test_ipam_models.py |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit c2c5415058cffcb3eefb38c25ec2fff20eca861d
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jan 27 18:34:11 2012 +0530

    Updates mac ranges and fixes errors in docs
    
    Change-Id: I98ef53b4d2cfac7749268a4b4a15632ddcc6904e

 doc/source/apidoc.rst |  408 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 303 insertions(+), 105 deletions(-)

commit 41a38d96a63732a18330e4863487b93d92d29ea9
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Jan 26 16:49:46 2012 +0000

    Add lxml to pip-requires
    
    Without this, I was getting:
    
      ERROR: Failure: ImportError (No module named lxml)
      ...
      ImportError: No module named lxml
      ...
      ERROR: test_versions_index (melange.tests.unit.test_versions.TestVersionsController)
      ...
      Got: ImportError('No module named lxml',)
      ...
      ERROR: test_versions_index_for_xml (melange.tests.unit.test_versions.TestVersionsController)
      Got: ImportError('No module named lxml',)
    
    Change-Id: I73eac14526d4ea5991b5d7186d42208a4c230569

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e23effda880552f8f208efabf53126c9c1c61724
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu Jan 26 12:16:40 2012 +0000

    Import copies of the required openstack.common modules
    
    The APIs melange is using are "incubating" in openstack-common. See:
    
      http://wiki.openstack.org/CommonLibrary#Incubation
    
    A config file is included for openstack-common's copy-and-paste script
    to make it easy to update the code e.g.
    
      $> git clone .../melange
      $> git clone .../openstack-common
      $> cd openstack-common
      $> python update.py ../melange/
    
    Note: the copies of the openstack.common modules should never be directly
    modified, instead you should always make the modifications in openstack-common
    and copy them across using the script.
    
    Change-Id: I0245e30e4b4a9a2214c4f8a291b7f2caa54ab97e

 HACKING                                |   15 +
 melange/common/config.py               |    2 +-
 melange/common/exception.py            |    2 +-
 melange/common/extensions.py           |    2 +-
 melange/common/utils.py                |    2 +-
 melange/common/wsgi.py                 |    2 +-
 melange/openstack/__init__.py          |   16 +
 melange/openstack/common/README        |   13 +
 melange/openstack/common/__init__.py   |   16 +
 melange/openstack/common/config.py     |  337 +++++++++++++++
 melange/openstack/common/exception.py  |  147 +++++++
 melange/openstack/common/extensions.py |  538 ++++++++++++++++++++++++
 melange/openstack/common/utils.py      |  210 ++++++++++
 melange/openstack/common/wsgi.py       |  717 ++++++++++++++++++++++++++++++++
 openstack-common.conf                  |    7 +
 setup.py                               |    2 +-
 tools/pip-requires                     |    1 -
 17 files changed, 2022 insertions(+), 7 deletions(-)

commit 5b5e1ec321504ca38c357897a1d5256b7b96be81
Merge: dd21327 509af89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 23:10:41 2012 +0000

    Merge "fixes bug 921698 by specifying network_owner_tenant_id"

commit dd21327846c92d31ff43a3395c4abfddc19ee0fd
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Wed Jan 25 15:50:29 2012 -0600

    mac_addresses now come across in UNIX format,
    the format preferred by hypervisors.
    
    update: apparently re is no bueno
    
    Change-Id: Ie024e645b4c9a7c39e1e6cc0016a5eb11982312d

 melange/ipam/models.py                  |    9 +++++++++
 melange/ipam/views.py                   |    2 +-
 melange/tests/unit/test_ipam_models.py  |   15 ++++++++++++++-
 melange/tests/unit/test_ipam_service.py |    4 ++--
 melange/tests/unit/test_ipam_views.py   |    2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

commit eb294a5b69f4e3a14d34a4f13c44461ed2ef6981
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Wed Jan 25 20:08:34 2012 +0000

    Adds network_id to the ip_blocks view
    
    Change-Id: I1ff225af98cc10624e5ff2866f1cad98c412a4f7

 melange/ipam/views.py                 |    1 +
 melange/tests/unit/test_ipam_views.py |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

commit 509af8997654ced7e1d8ac7e384f7e35773e10d9
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jan 25 23:09:33 2012 +0530

    fixes bug 921698 by specifying network_owner_tenant_id
    
    In the interface create API, uses an additional tenant_id parameter in the
    network params for specifying the network owner tenant separately from the
    instance owning tenant.
    
    Change-Id: I57c2bf412b855eeb5f79dab8b3c5c46942819648

 doc/source/apidoc.rst                   |    2 +-
 melange/ipam/service.py                 |    2 +-
 melange/tests/unit/test_ipam_service.py |   52 ++++++++++++++++++++++++++-----
 3 files changed, 46 insertions(+), 10 deletions(-)

commit 0032811305576a32f307351617a1926bca231439
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jan 24 22:30:10 2012 +0530

    Corrected instance interface api doc.
    
    fixed urls and made input params documentation clearer.
    
    Change-Id: Iefe22d3a73391dc70f44c60ab3fb6ff600b604c2

 doc/source/apidoc.rst |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

commit 39bca997f15ad96f8d2335fbb03986d25fb07653
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jan 24 20:12:13 2012 +0530

    Documentation for Instance's interfaces REST api
    
    Change-Id: I36c1b311e3feb5a9eb3176592e308865f55d0e2b

 doc/source/apidoc.rst |  158 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 158 insertions(+), 0 deletions(-)

commit 4d790361eae584248b9c1da3398e89f63e5c5291
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jan 19 18:08:20 2012 +0530

    adds REST api for allocating all interfaces of an instance
    
    Change-Id: I89c9b33f01af2a500879149f28d03c0aa2c17e6e

 .../migrate_repo/versions/001_base_schema.py       |    5 +-
 melange/ipam/models.py                             |   23 +++-
 melange/ipam/service.py                            |   79 ++++++++++-
 melange/tests/factories/models.py                  |    2 +-
 melange/tests/unit/test_ipam_models.py             |   51 ++++---
 melange/tests/unit/test_ipam_service.py            |  144 ++++++++++++++++----
 melange/tests/unit/test_ipam_views.py              |    6 +-
 7 files changed, 241 insertions(+), 69 deletions(-)

commit af1e6f375c0f046a43db3ec5bbf3eb79551cbb6d
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jan 20 13:07:13 2012 -0600

    Declare the melange namespace
    
    This allows the client module to share the melange.* namespace
    Rename bin/melange to bin/melange-server
    
    Change-Id: I0ae94fbad7912b2642a6f53217fbd16c700e0dad

 bin/melange         |   67 ---------------------------------------------------
 bin/melange-server  |   67 +++++++++++++++++++++++++++++++++++++++++++++++++++
 melange/__init__.py |    5 ++++
 setup.py            |    2 +-
 4 files changed, 73 insertions(+), 68 deletions(-)

commit ce0ba2e45a2cdc63398759954fd3bfe5060dfc5b
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jan 23 17:36:07 2012 +0530

    Removes client and associated functional test code
    
    All the functionality removed has already made it into the client repo
    
    Change-Id: Icc4748100d06d0bac08619d7fe17c924b81a106f

 bin/melange-client                       |  234 ------------
 doc/source/conf.py                       |    4 +-
 melange/common/auth.py                   |   24 --
 melange/common/client.py                 |   57 ---
 melange/common/utils.py                  |   26 --
 melange/ipam/client.py                   |  342 -----------------
 melange/tests/functional/__init__.py     |   33 --
 melange/tests/functional/server.py       |   78 ----
 melange/tests/functional/test_cli.py     |  613 ------------------------------
 melange/tests/functional/test_service.py |   83 ----
 melange/tests/unit/test_auth.py          |   55 ---
 setup.py                                 |    1 -
 12 files changed, 1 insertions(+), 1549 deletions(-)

commit 94469fc37911e4d7d04837d5a4f8b1e34c1de0fb
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jan 23 11:37:32 2012 +0530

    fixes bug 919158 , default ip blocks are now optional
    
    Change-Id: Ic15f18a7f56992afa214c667a84c834fe58566ea

 etc/melange/melange.conf.sample         |    7 ++++---
 melange/ipam/models.py                  |    6 +++++-
 melange/tests/functional/test_cli.py    |    3 +++
 melange/tests/unit/test_ipam_models.py  |   11 +++++++++++
 melange/tests/unit/test_ipam_service.py |   31 ++++++++++++++++++-------------
 5 files changed, 41 insertions(+), 17 deletions(-)

commit 0894193d12584cc62b55d27e84aeb04a25b5a382
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jan 20 17:05:19 2012 +0530

    fixes bug 919155 by tracking deallocated macs in the allocatable_macs table
    
    Change-Id: I6d78d503393e9c3e584dffec9a7ec50c7247afdd

 melange/db/sqlalchemy/api.py                       |   12 +++---
 melange/db/sqlalchemy/mappers.py                   |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   16 +++++++--
 melange/ipam/models.py                             |   35 ++++++++++++++-----
 melange/ipv4/db_based_ip_generator.py              |    3 +-
 melange/tests/unit/test_ipam_models.py             |   19 +++++++++++
 6 files changed, 67 insertions(+), 20 deletions(-)

commit 454d352a998723d5e1d4902f42eceb40d97c8731
Author: Aaron Lee <aaron.lee@rackspace.com>
Date:   Fri Jan 20 16:48:57 2012 -0600

    Adding pip install instructions to readme.
    
    Change-Id: Id3e5ee69ab2eb4cf327f0bfdc874b4eff329ee9c

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6b86a3b8407562ee7ca0cd97fdc06fd83d9d6232
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jan 20 18:06:13 2012 +0530

    fixes bug 919055 allowing interfaces to be retrieved without device id
    
    Change-Id: Ief7c881d55094f65f874c902c0b3ab394abf5f31

 melange/ipam/models.py                 |    1 -
 melange/tests/unit/test_ipam_models.py |   16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

commit 11478ef1872aa88ccf9f0b28709bda00c423d42c
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jan 13 10:01:34 2012 -0600

    Have melange-cli installed
    
    Change-Id: I5f17cbf0b15e3902eef8639cfd561185e14989c5

 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 56b4466c398c8e5a3300a7e6335945859fc93c8a
Author: Rajaram Mallya and Gavri Fernandez <rax_network_service+rmallya+gavri@thoughtworks.com>
Date:   Fri Jan 6 11:38:55 2012 +0530

    fixes bug 911242
    
    mac address ranges and ip blocks for selecting
    ips/macs are sorted by created date and id
    
    Change-Id: Ib0bafcd9600bba70fff163da536551b2d7bf9acc

 etc/melange/melange.conf.sample        |    2 +-
 melange/ipam/models.py                 |   11 +++-
 melange/tests/__init__.py              |    5 ++
 melange/tests/unit/test_ipam_models.py |   77 ++++++++++++++++++++++++++++---
 melange/tests/unit/test_notifier.py    |    6 +--
 5 files changed, 84 insertions(+), 17 deletions(-)

commit 14966a13f3ac907f9f80e5c124511ec20dd5bf23
Author: Rajaram Mallya and Gavri Fernandez <rax_network_service+rmallya+gavri@thoughtworks.com>
Date:   Thu Jan 5 16:13:17 2012 +0530

    fixes bug 911255 show on deallocated ip fails
    
    Change-Id: I92d6ebc44414bc15989a4a9dd90acf24250d38fb

 melange/ipam/models.py                  |    4 ++++
 melange/ipam/views.py                   |    2 +-
 melange/tests/__init__.py               |    2 ++
 melange/tests/unit/test_ipam_models.py  |    8 +++++++-
 melange/tests/unit/test_ipam_service.py |    2 +-
 melange/tests/unit/test_ipam_views.py   |   14 +++++++++++++-
 6 files changed, 28 insertions(+), 4 deletions(-)

commit f1091479c1e6b1e776b3e65bdf0081f24d03849a
Author: Rajaram Mallya and Gavri Fernandez <rax_network_service@thoughtworks.com>
Date:   Wed Dec 21 20:47:33 2011 +0530

    Changed cli arguments to be key value pairs to allow optional args to be skipped
    
    Change-Id: Ic56ac3848b700dc26a2178d1050a132f05e0478c

 bin/melange-client                   |   14 +++-
 melange/common/utils.py              |    6 +-
 melange/ipam/client.py               |    8 +-
 melange/tests/functional/test_cli.py |  185 +++++++++++++++++++--------------
 melange/tests/unit/test_utils.py     |    4 +-
 5 files changed, 128 insertions(+), 89 deletions(-)

commit d0e39ba3698599a38df7c3037237b34670728f36
Author: Rajaram Mallya and Gavri Fernandez <rax_network_service@thoughtworks.com>
Date:   Tue Dec 20 18:16:39 2011 +0530

    Bug fixes accomodating mysql and postgresql
    
    Change-Id: I73e114e78410e9f9cf46b6ac3d3000c0fb0dad00

 etc/melange/melange.conf.sample                    |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   10 +-
 melange/ipam/models.py                             |    5 +-
 melange/tests/__init__.py                          |    1 +
 melange/tests/unit/test_ipam_models.py             |   97 ++++++++++---------
 melange/tests/unit/test_ipam_service.py            |   13 +--
 melange/tests/unit/test_ipam_views.py              |   33 ++++---
 7 files changed, 90 insertions(+), 71 deletions(-)

commit d342a626b4f9684373b163392117b28a839a778b
Merge: 6068d1b 9f3a927
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 16:50:24 2011 +0000

    Merge "Force using the melange branch of openstack.common."

commit 9f3a927cedde624197021784ed70168d7c5e0463
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Dec 6 16:55:31 2011 -0600

    Force using the melange branch of openstack.common.
    
    This ensures will ensure that melange will always be installable
    until openstack.common gets bootstrapped and the api's commited to.
    
    Change-Id: Ifb99dea4acc70324a1450825efc68c862cb81dd3

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 6068d1bc55edc6f4bbde6fc20102698a55fb67fc
Merge: b864e2b dadee9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 21:48:21 2011 +0000

    Merge "Rename .melange-venv to .venv."

commit b864e2b6733ddf1be4f3bdec8fc9c989608b5099
Merge: 644fb27 80604d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 6 20:05:13 2011 +0000

    Merge "Fixed table creation order"

commit 644fb274967145ff6ecfac56561ac4610e4d7f56
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Thu Dec 1 19:36:28 2011 +0530

    Rajaram/Gavri: Added example responses
    
    Cherry-picked from old github repo by jkoelker
    
    Change-Id: I37cc840ce0c70b123924c78bff6935c99b9d7bc7

 doc/source/apidoc.rst |  937 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 852 insertions(+), 85 deletions(-)

commit 80604d8288195b45ce9125d8de64b254c891e4b4
Author: Rajaram and Gavri <gavri.fernandez@gmail.com>
Date:   Tue Dec 6 12:03:10 2011 +0530

    Fixed table creation order
    
    Was working on sqlite, but was failing on postgresql and mysql
    
    Change-Id: Id081ce17900c5900b0ed6befc31013416ddb79fa

 .../migrate_repo/versions/001_base_schema.py       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit dadee9bcf9bbdf2ffcbdf28feb926fb73794e64a
Author: James E. Blair <jeblair@hp.com>
Date:   Mon Dec 5 11:20:42 2011 -0800

    Rename .melange-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: Ib2acff3dd078f3f13a16172f9068cd2b0620d55f

 .gitignore            |    1 +
 .mailmap              |    1 +
 Authors               |    2 +-
 run_tests.sh          |    2 +-
 tools/install_venv.py |    4 ++--
 tools/with_venv.sh    |    2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

commit 2f8cddf92a42b1951453c45d653425ad4a4abfbb
Author: Chuck Short <chuck.short@canonical.com>
Date:   Mon Dec 5 13:35:54 2011 -0500

    Dont ship a melange-api it doesnt exist.
    
    Change-Id: I5d0e14373327c86a8c7822669d440987ddfdd73e

 setup.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit d408c606b0f899617251ea39632e22b00ec47d84
Author: James E. Blair <jeblair@hp.com>
Date:   Wed Nov 30 13:28:25 2011 -0800

    Add .gitreview file to support the git-review tool.
    
    Change-Id: I4c518e985a7c24b1d41789f13f73bf069e6b1fbd

 .gitreview |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 62bec74ee012409c74171b17aa3f275f57d3dafc
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Wed Nov 30 18:52:27 2011 +0530

    Gavri/Rajaram|Added api documentation from the wiki

 .gitignore            |    1 +
 doc/source/apidoc.rst | 1140 +++++++++++++++++++++++++++++++++++++++++++++++++
 doc/source/conf.py    |   31 +-
 doc/source/index.rst  |   13 +-
 4 files changed, 1159 insertions(+), 26 deletions(-)

commit e5247c818790926daf8c0f90090ec71b5f7da6ab
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Nov 28 17:48:20 2011 +0530

    Rajaram/Gavri|notifications added for ip block and ip address creation and deletion

 melange/common/notifier.py             |   98 ++++++---------
 melange/ipam/models.py                 |   92 ++++++++++-----
 melange/tests/unit/test_ipam_models.py |   77 ++++++++++++
 melange/tests/unit/test_notifier.py    |  210 ++++++++++++++++++++------------
 4 files changed, 309 insertions(+), 168 deletions(-)

commit 5f98fff5d19f4cc18737676edabc96b9e3417d17
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Wed Nov 23 19:39:02 2011 +0530

    Rajaram/Gavri: Moved common actions into mixins

 melange/common/utils.py                 |    6 ++
 melange/ipam/service.py                 |   67 ++++++++++----------
 melange/tests/unit/test_ipam_service.py |  104 +++++++++++++++++++++++-------
 3 files changed, 117 insertions(+), 60 deletions(-)

commit c95977c5b508004b94c2013953b01b191a788175
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Tue Nov 22 17:36:53 2011 +0530

    Gavri/Rajaram|mac address range cli with show delete and list

 melange/ipam/client.py               |    9 +++++++++
 melange/tests/functional/test_cli.py |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)

commit 136a9e353c28102d117cb9595a74e144e723f808
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Tue Nov 22 15:56:16 2011 +0530

    Rajaram/Gavri|added index and delete on mac address range

 melange/ipam/service.py                 |    7 ++++++
 melange/tests/unit/test_ipam_service.py |   34 +++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

commit 27fd7dcf666306e5531353b11876379d14425a53
Author: Gavri <gavri.fernandez@gmail.com>
Date:   Mon Nov 21 18:42:57 2011 +0530

    Gavri/Rajaram|added show to MacAddressRangeController

 .gitignore                              |    1 +
 melange/ipam/models.py                  |    3 ++-
 melange/ipam/service.py                 |    3 +++
 melange/tests/unit/test_ipam_models.py  |   18 ++++++++++++++----
 melange/tests/unit/test_ipam_service.py |   10 ++++++++++
 5 files changed, 30 insertions(+), 5 deletions(-)

commit 8535ff4a8dec8ff9c7dd6bf30cf2eee83694ca13
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Nov 21 10:23:33 2011 +0530

    CLI commands for shared ips

 bin/melange-client                   |    1 +
 melange/ipam/client.py               |   28 ++++++++
 melange/tests/functional/test_cli.py |  113 ++++++++++++++++++++++++++++------
 3 files changed, 123 insertions(+), 19 deletions(-)

commit 643e2c30a08e84527a01e7b0be4f04ecb1d00d7e
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Nov 18 16:04:04 2011 +0530

    Interface allows ips only in the same network

 melange/ipam/models.py                  |   15 ++++-
 melange/ipam/service.py                 |    4 +
 melange/tests/factories/models.py       |    2 +
 melange/tests/unit/test_ipam_models.py  |  105 +++++++++++++++++++++++-------
 melange/tests/unit/test_ipam_service.py |   57 +++++++++-------
 5 files changed, 131 insertions(+), 52 deletions(-)

commit 394e9fd6e6d2d54f69700be1cae5736e4e2659a5
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 17 17:06:34 2011 +0530

    Ips cannot be allocated on an interface plugged into a different network

 melange/ipam/models.py                  |   55 +++++++++++++++++++-----------
 melange/ipam/views.py                   |    5 +--
 melange/tests/factories/models.py       |    1 +
 melange/tests/unit/test_ipam_models.py  |   38 ++++++++++++++++++---
 melange/tests/unit/test_ipam_service.py |   10 +++--
 5 files changed, 77 insertions(+), 32 deletions(-)

commit 23d98043212bcd7c2b7ab92fcb6e3756a7113cac
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 17 12:21:09 2011 +0530

    Query is better abstracted

 melange/db/__init__.py                 |   53 ++++++++++++++++++++
 melange/db/sqlalchemy/api.py           |   14 +++---
 melange/ipam/models.py                 |   85 ++++++-------------------------
 melange/tests/unit/test_ipam_models.py |   17 ++++---
 4 files changed, 87 insertions(+), 82 deletions(-)

commit 124328b6285775cd7554cf4619c774432dc21aca
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Nov 16 17:44:52 2011 +0530

    Added show and delete for allowed ips

 melange/ipam/models.py                  |   12 +++
 melange/ipam/service.py                 |   26 ++++++-
 melange/tests/unit/test_ipam_models.py  |   25 ++++++
 melange/tests/unit/test_ipam_service.py |  142 +++++++++++++++++++++++++++++++
 4 files changed, 204 insertions(+), 1 deletions(-)

commit e70a3fe45884e72593317917bf986a1c133cf0cf
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Nov 16 12:47:11 2011 +0530

    AllowedIps Route with create and index

 melange/db/sqlalchemy/api.py            |    2 +-
 melange/ipam/models.py                  |   21 ++++++++--
 melange/ipam/service.py                 |   63 +++++++++++++++++++++---------
 melange/tests/unit/test_ipam_models.py  |   45 ++++++++++++++++-----
 melange/tests/unit/test_ipam_service.py |   38 ++++++++++++++++++
 run_tests.sh                            |    2 +-
 6 files changed, 134 insertions(+), 37 deletions(-)

commit 9c23eca47f859f426eabca843b09e1632b74fee4
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Nov 15 15:39:32 2011 +0530

    IpAddress has used_by_tenant independent of interface and fixed bug with block.delete_deallocated_ips

 melange/db/sqlalchemy/api.py                       |    5 +-
 .../migrate_repo/versions/001_base_schema.py       |    1 +
 melange/ipam/models.py                             |   22 +++++++--
 melange/tests/unit/test_ipam_models.py             |   50 ++++++++++++++------
 4 files changed, 55 insertions(+), 23 deletions(-)

commit 75fecc72796ccc3941d4ff0cf579dd2679f25e42
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Nov 14 18:20:04 2011 +0530

    Allowed ips consist of allocated and explicitly allowed ips

 melange/db/sqlalchemy/api.py           |   22 ++++++++--
 melange/ipam/models.py                 |   24 +++++++----
 melange/tests/unit/test_ipam_models.py |   71 ++++++++++++++++++++++++++++++-
 3 files changed, 101 insertions(+), 16 deletions(-)

commit b2c96305a8202e65387ce0363a362b8fdf542ee6
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 10 18:27:23 2011 +0530

    Refactored the natting queries

 melange/db/sqlalchemy/api.py            |   30 +++++++++++-------------------
 melange/ipam/models.py                  |   28 +++++++++++++++++++---------
 melange/ipam/service.py                 |    6 ++++--
 melange/tests/unit/test_ipam_models.py  |   27 +++++++++++----------------
 melange/tests/unit/test_ipam_service.py |   30 +++++++++++++-----------------
 5 files changed, 58 insertions(+), 63 deletions(-)

commit e7e568d7b6579382e2da9d213f727aa73ca97c2e
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 10 15:41:15 2011 +0530

    interface has a list of allowed ips

 etc/melange/melange.conf.sample                    |    4 +-
 melange/db/sqlalchemy/api.py                       |   20 +++++++++++++++-
 melange/db/sqlalchemy/mappers.py                   |   24 ++++++++++++++++++++
 .../migrate_repo/versions/001_base_schema.py       |   16 ++++++++++---
 melange/ipam/models.py                             |   15 +++++++++---
 melange/tests/factories/models.py                  |    8 +++---
 melange/tests/unit/test_ipam_models.py             |   23 +++++++++++++++++++
 7 files changed, 94 insertions(+), 16 deletions(-)

commit 0c3abeafd7fc22f3a75a6759864f2fa9715112b9
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Nov 9 16:11:02 2011 +0530

    test for 404 on networks resource index

 melange/tests/unit/test_ipam_service.py |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

commit 140da59afffed708d6cce8cbded5794e3e1eb71d
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Nov 9 15:45:58 2011 +0530

    GET on /ipam/tenants/{tenant_id}/networks/{network_id} lists ip_blocks of the network

 melange/ipam/service.py                 |   17 ++++++++-
 melange/tests/unit/test_ipam_service.py |   61 +++++++++++++++++++------------
 2 files changed, 52 insertions(+), 26 deletions(-)

commit 1704cd4f2584d5dac2e2e00840ae7cac9bfed157
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Nov 9 12:33:40 2011 +0530

    Added notifer and tests from glance with some modifications

 melange/common/exception.py                        |    5 +
 melange/common/messaging.py                        |   54 +++++++
 melange/common/notifier.py                         |  111 ++++++++++++++
 melange/common/queue.py                            |   54 -------
 melange/ipv4/queue_based_ip_generator.py           |    4 +-
 .../functional/test_ipv4_queue_based_generator.py  |    4 +-
 melange/tests/unit/test_messaging.py               |   41 +++++
 melange/tests/unit/test_notifier.py                |  154 ++++++++++++++++++++
 melange/tests/unit/test_queue.py                   |   41 -----
 9 files changed, 369 insertions(+), 99 deletions(-)

commit 1e9f567e1d8c313c70d7682f78de95e5fa16bc5a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Nov 8 14:57:49 2011 +0530

    moved queue to common

 melange/common/queue.py                            |   54 ++++++++++++++++++++
 melange/ipv4/queue_based_ip_generator.py           |   41 +--------------
 .../functional/test_ipv4_queue_based_generator.py  |    3 +-
 .../tests/unit/test_ipv4_queue_based_generator.py  |   42 ---------------
 melange/tests/unit/test_queue.py                   |   41 +++++++++++++++
 5 files changed, 100 insertions(+), 81 deletions(-)

commit cbc7aca767d36c1326a6f171bdde35bc0db93f4d
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Nov 8 14:28:18 2011 +0530

    Rajaram|abstracted kombu out to make using a queue simpler

 melange/ipv4/queue_based_ip_generator.py           |   29 +++++++++++++++++---
 .../functional/test_ipv4_queue_based_generator.py  |    4 +-
 .../tests/unit/test_ipv4_queue_based_generator.py  |    2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

commit 0e7f16edecaca3069cda7b04c3eb334e53342af8
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Nov 4 16:04:49 2011 +0530

    Rajaram|moved ipv4 queue params to config

 etc/melange/melange.conf.sample                    |   10 +++
 melange/common/config.py                           |    7 ++
 melange/ipv4/queue_based_ip_generator.py           |   25 +++++---
 melange/tests/functional/test_ip_prefetch.py       |   62 --------------------
 .../functional/test_ipv4_queue_based_generator.py  |   57 ++++++++++++++++++
 melange/tests/unit/test_config.py                  |   37 +++++-------
 .../tests/unit/test_ipv4_queue_based_generator.py  |   42 +++++++++++++
 7 files changed, 145 insertions(+), 95 deletions(-)

commit f6ae308c393eedd4759eba00fb744e236ff072c4
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 3 15:40:47 2011 +0530

    Rajaram|mac address allocation retried on error

 melange/ipam/models.py                  |   53 +++++++++++++----
 melange/ipam/service.py                 |    2 +-
 melange/tests/unit/test_ipam_models.py  |  101 ++++++++++++++++++++++++++++++-
 melange/tests/unit/test_ipam_service.py |    2 +-
 melange/tests/unit/test_wsgi.py         |    5 ++
 5 files changed, 147 insertions(+), 16 deletions(-)

commit 72c0527ef1ae4e6f69b080638c32e3673c15549c
Merge: 1821690 b5bbe58
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 3 12:19:13 2011 +0530

    Merge branch 'master' of github.com:jkoelker/melange

commit 18216905099dec6a7b700232008a7e61213c5927
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 3 12:15:49 2011 +0530

    Rajaram|converted request params to non unicode strings to fix http://bugs.python.org/issue2646 for pre 2.6.5 python versions

 melange/common/wsgi.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit f77cbdee900b1329b08ff078e02b5a98060f6ac3
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 3 12:13:40 2011 +0530

    Rajaram|switched off debug and verbose logging in conf. It was causing tests to go very slow

 etc/melange/melange.conf.sample |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 568f7f121ff712aa94f5e4a97e4d4daf35df200d
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Nov 3 12:13:19 2011 +0530

    Rajaram| added httplib2 to pip-requires

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b5bbe5848ed0302e87f75cad68690d09cad0411c
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Nov 2 10:05:43 2011 -0500

    remove bzrignore

 .bzrignore |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

commit 6f07a21db1e6010fd53874590f40c858370f8842
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 18:11:11 2011 -0500

    remove more nova references

 MANIFEST.in  |   42 ++++--------------------------------------
 README       |    2 +-
 doc/Makefile |    1 -
 pylintrc     |    4 ++--
 setup.cfg    |    8 ++++----
 5 files changed, 11 insertions(+), 46 deletions(-)

commit e2adafbc66edf172fb9f8872d17326df57ef700e
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 17:47:58 2011 -0500

    update .gitignore

 .gitignore |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

commit 7f34a11d59dfbdde69e52c04eea3dc8db28c4e3c
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 17:35:34 2011 -0500

    update README since melange tests run by default now

 README |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

commit b3fc2dd2ae351a821df8363022cf66a024a8c673
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 14:08:35 2011 -0500

    remove unbound variable

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit a14530f29cf251cd8a1693382154a402ada91ae6
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 14:00:51 2011 -0500

    apparantly we do need kombu ;)

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit d516cca3b59bb14b57eaed2413e23c9e27f0b208
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:59:42 2011 -0500

    missed a nova reference

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit a5c5c8d0e7528cc04d804a926f8f133063a99dbf
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:54:47 2011 -0500

    remove the manual install of openstack-skeleton since openstack.common is now in pip-requires

 tools/install_venv.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

commit 820d859ae14b78b772db118359bd780dc060589f
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:51:21 2011 -0500

    move melange's README to project root

 README         |   16 ++++++++++++++++
 melange/README |   16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

commit 9c476ade3ef3c755f75f3eed99c3d54196be5244
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:50:45 2011 -0500

    remove Nova's README

 README |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

commit bfbf083d218afa85605d7a2af5f54f7870337f08
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:19:02 2011 -0500

    add location of openstack.common

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 04cf4534e87de0f21d460965fe96bbac2d421749
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:14:47 2011 -0500

    add requirement of openstack.common

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 869dc95104455897e2063ed7ea903447cb3fdc19
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 13:09:35 2011 -0500

    de-nova setup system

 melange/version.py |   19 ++++++++-
 setup.py           |  115 +++++++++++++++++++++++++---------------------------
 tools/pip-requires |   35 +++-------------
 3 files changed, 79 insertions(+), 90 deletions(-)

commit 245230e420d258140125a7e05e454a37846afd96
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 12:58:52 2011 -0500

    de-nova the venv

 tools/install_venv.py |   20 ++++++++++----------
 tools/with_venv.sh    |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

commit 3db4d8dc3b33d0bdc92308a929684436d5d8286a
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 12:56:44 2011 -0500

    de-nova the test runner

 run_tests.py |   40 ++++++++++++++++++++++------------------
 run_tests.sh |   16 +++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

commit adf11f731c2e014ab93bdb77a29d2e43d8323dc5
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Nov 1 12:36:19 2011 -0500

    Add docs from skeleton

 doc/Makefile                       |   97 +++++++++
 doc/source/_static/basic.css       |  416 ++++++++++++++++++++++++++++++++++++
 doc/source/_static/default.css     |  230 ++++++++++++++++++++
 doc/source/_static/jquery.tweet.js |  154 +++++++++++++
 doc/source/_static/tweaks.css      |   65 ++++++
 doc/source/_theme/layout.html      |   86 ++++++++
 doc/source/_theme/theme.conf       |    5 +
 doc/source/conf.py                 |  252 ++++++++++++++++++++++
 doc/source/index.rst               |   53 +++++
 9 files changed, 1358 insertions(+), 0 deletions(-)

commit d583c10a2de5754312aaf603bb3e71a879f2eebe
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Fri Oct 28 10:19:25 2011 +0530

    Vinkesh | Interface create response now returns whole interface configuration data including MAC address and IP Addresses information

 melange/ipam/service.py                 |    4 +++-
 melange/tests/unit/test_ipam_service.py |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

commit 450dfa52662042ffb89e3278e11c10ced6c08a3d
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Oct 25 16:47:44 2011 +0530

    Vinkesh | Exposed an API to create mac_address_range. Also added its CLI

 bin/melange-client                      |    1 +
 melange/ipam/client.py                  |   15 +++++++++++++++
 melange/ipam/service.py                 |   15 +++++++++++++++
 melange/tests/functional/test_cli.py    |   11 +++++++++++
 melange/tests/unit/test_ipam_service.py |   13 +++++++++++++
 5 files changed, 55 insertions(+), 0 deletions(-)

commit 573cde9a0afe0eb894e1b1ba1ce9eeed064f19ee
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Oct 25 15:56:01 2011 +0530

    Vinkesh | Added CLI for Interface

 bin/melange-client                      |    3 +-
 melange/ipam/client.py                  |   38 ++++++++++++++++++-----
 melange/ipam/service.py                 |    2 +-
 melange/tests/functional/test_cli.py    |   52 +++++++++++++++++++++++++++++++
 melange/tests/unit/test_ipam_service.py |   12 +++---
 5 files changed, 91 insertions(+), 16 deletions(-)

commit 411282ce01ffe74b76462e8ae72c77f23f0939cb
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Oct 25 12:09:41 2011 +0530

    Vinkesh | Added show action on interface to return the interface configurations like mac address and ip addresses

 melange/db/sqlalchemy/api.py            |    2 +-
 melange/ipam/models.py                  |   12 ++++++++----
 melange/ipam/service.py                 |   12 +++++++++++-
 melange/ipam/views.py                   |   13 +++++++++++++
 melange/tests/unit/test_ipam_models.py  |   10 ++++++++++
 melange/tests/unit/test_ipam_service.py |   20 +++++++++++++++++++-
 melange/tests/unit/test_ipam_views.py   |   26 ++++++++++++++++++++++++++
 7 files changed, 88 insertions(+), 7 deletions(-)

commit bf28cbeb1058a55172cd0d885713a6891f8b7007
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Oct 25 10:22:44 2011 +0530

    Vinkesh/Rajaram| tracking mac addresses sent as a parameter and added delete of interface

 melange/ipam/models.py                  |   27 ++++++++++---
 melange/ipam/service.py                 |   19 ++++++---
 melange/ipv6/__init__.py                |    4 +-
 melange/tests/unit/test_ipam_models.py  |   62 ++++++++++++++++++++++++++----
 melange/tests/unit/test_ipam_service.py |   47 +++++++++++++++++------
 5 files changed, 124 insertions(+), 35 deletions(-)

commit b2ed8f8fdf1a052c0b4a1c0b4c298609a7cfcb39
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Oct 24 15:42:39 2011 +0530

    Rajaram/Vinkesh|interface controller takes network params for ip allocation and Interface model validates presence of tenant id

 melange/common/utils.py                 |    6 ++
 melange/ipam/models.py                  |    2 +-
 melange/ipam/service.py                 |   17 +++---
 melange/tests/unit/test_ipam_models.py  |    8 +++
 melange/tests/unit/test_ipam_service.py |   98 ++++++++++++++++++++++++++++++-
 melange/tests/unit/test_utils.py        |   28 ++++++---
 6 files changed, 137 insertions(+), 22 deletions(-)

commit c0a8b0a2108f8c485b8273599fa8861d3f834aed
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Oct 24 10:56:26 2011 +0530

    Rajaram/Vinkesh|Added interface resource with create

 melange/ipam/models.py                  |    7 ++++
 melange/ipam/service.py                 |   22 ++++++++++++
 melange/tests/unit/test_ipam_models.py  |   11 ++++++
 melange/tests/unit/test_ipam_service.py |   54 +++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 0 deletions(-)

commit 76d49d2a536c72fd1bc517b4365ea1df336830c9
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 21 18:21:05 2011 +0530

    Rajaram/Vinkesh | Moved used_by_tenant information from ip_address to interface

 melange/db/sqlalchemy/api.py                       |   10 +-
 .../migrate_repo/versions/001_base_schema.py       |    2 +-
 melange/ipam/models.py                             |   70 +++---
 melange/ipam/service.py                            |   19 +-
 melange/tests/factories/models.py                  |    1 +
 melange/tests/functional/test_cli.py               |   10 +-
 melange/tests/unit/test_ipam_models.py             |  227 +++++++++++--------
 melange/tests/unit/test_ipam_service.py            |   96 +++++----
 8 files changed, 238 insertions(+), 197 deletions(-)

commit 8c8b928e0b9bd212ede125f62fa27b1ab52f7cd1
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 21 12:29:48 2011 +0530

    Vinkesh/Rajaram|addded delete in interface model

 melange/ipam/models.py                 |   10 ++++++++++
 melange/tests/unit/test_ipam_models.py |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

commit 87bb3bdc83a925e511a9a1d171dac0b9d5e80b92
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 21 11:12:58 2011 +0530

    Rajaram/Vinkesh|inside locals/globals now mandate that all ip addressess preexist

 melange/ipam/models.py                  |   20 ++++----------
 melange/ipam/service.py                 |   38 ++++++++++++--------------
 melange/tests/unit/test_ipam_models.py  |   43 +++++++++++++++++++----------
 melange/tests/unit/test_ipam_service.py |   44 +++++++++++++++++++-----------
 4 files changed, 80 insertions(+), 65 deletions(-)

commit bbc3917e00fd94256d6a16a2cadcdcca04acecee
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Oct 20 18:30:14 2011 +0530

    Rajaram/Vinkesh | Added validation for presence and existance of interface_id in IpAddress

 melange/ipam/models.py                  |   11 ++-
 melange/ipam/service.py                 |    7 +-
 melange/tests/factories/models.py       |    1 +
 melange/tests/functional/test_cli.py    |    8 +-
 melange/tests/unit/test_ipam_models.py  |  200 +++++++++++++++++++------------
 melange/tests/unit/test_ipam_service.py |   76 +++++++-----
 6 files changed, 188 insertions(+), 115 deletions(-)

commit 000781a887bba379e415c4df439c517797e7846f
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Oct 19 17:30:28 2011 +0530

    Vinkesh/Rajaram|Renamed NetworksController to InterfaceIpAllocations controller

 melange/ipam/service.py                 |   23 +++++++--------
 melange/tests/unit/test_ipam_service.py |   44 +++++++++++++++---------------
 2 files changed, 33 insertions(+), 34 deletions(-)

commit 31ec0394908d710d9af334a38aaab72f6b35262a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Oct 19 16:15:52 2011 +0530

    Rajaram/Vinkesh| Mac addresses are allocated when ips get allocated

 melange/db/sqlalchemy/api.py            |    4 ++
 melange/ipam/models.py                  |   56 ++++++++++++++++++------
 melange/ipam/service.py                 |   17 +++++---
 melange/tests/factories/models.py       |    2 +-
 melange/tests/unit/__init__.py          |    4 +-
 melange/tests/unit/test_ipam_models.py  |   67 +++++++++++++++++++++++++++--
 melange/tests/unit/test_ipam_service.py |   71 +++++++++++++++++++++++++++++-
 melange/tests/unit/test_utils.py        |    1 +
 8 files changed, 191 insertions(+), 31 deletions(-)

commit 0c10d17ac62a7e872ca9d62f4ec6d8a60bab55c8
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Oct 18 18:30:09 2011 +0530

    Rajaram/Vinkesh | Added a method to allocate next free mac address from first free MAC range

 melange/ipam/models.py                 |   33 +++++++++++++++++++++++-
 melange/tests/unit/test_ipam_models.py |   42 ++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)

commit 705f619b0a71b20c600daadb8d893f7e73ff492b
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Oct 18 17:26:11 2011 +0530

    Rajaram/Vinkesh | added an interface model in preperation for incorporating mac address tracking in ip allocations

 melange/db/sqlalchemy/api.py                       |   14 ++-
 melange/db/sqlalchemy/mappers.py                   |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   38 ++++--
 melange/ipam/client.py                             |    5 +-
 melange/ipam/models.py                             |   56 ++++++---
 melange/ipam/service.py                            |   22 +++-
 melange/ipam/views.py                              |    2 +-
 melange/tests/factories/models.py                  |    8 +
 melange/tests/functional/test_cli.py               |   16 ++-
 melange/tests/unit/test_ipam_models.py             |  138 ++++++++++++++------
 melange/tests/unit/test_ipam_service.py            |   66 ++++++----
 melange/tests/unit/test_ipam_views.py              |    9 +-
 12 files changed, 261 insertions(+), 115 deletions(-)

commit 87e7677a6210e6bb447da382652d9d3a4c010e2b
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Oct 18 10:24:52 2011 +0530

    Rajaram/Vinkesh|fixed bug where allocated ip routes werent responding to .json or .xml paths and added dropping of db before running tests

 melange/ipam/service.py                 |   16 ++++++++++------
 melange/tests/functional/__init__.py    |    1 +
 melange/tests/unit/test_ipam_service.py |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

commit 25cbcc43eed6a3dd67d30a6abacee3e46fa84b29
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Oct 13 17:07:30 2011 +0530

    Rajaram/Vinkesh| added mac address models

 melange/db/sqlalchemy/mappers.py                   |    4 ++
 .../migrate_repo/versions/001_base_schema.py       |   19 +++++++-
 melange/ipam/models.py                             |   23 +++++++++++
 melange/tests/factories/models.py                  |    5 ++
 melange/tests/unit/test_ipam_models.py             |   42 ++++++++++++++++++++
 5 files changed, 90 insertions(+), 3 deletions(-)

commit 43b5e64426e33157e36f95f75d7e323e61e34ba2
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Oct 13 14:40:16 2011 +0530

    Rajaram/Vinkesh | kombu Brokers are in-memory for now

 melange/ipv4/queue_based_ip_generator.py     |   29 ++++++++++++-------------
 melange/tests/functional/test_ip_prefetch.py |    4 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

commit 34b9054f5376b1df982f42702a8995c658996419
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Oct 13 14:24:32 2011 +0530

    Revert "Vinkesh | Added shared_ips table. Added Interface model to deal with sharing of ips"
    
    This reverts commit 03f6144cf663ee82845ebef8332bfc308bf6615e.

 melange/db/sqlalchemy/mappers.py                   |    2 -
 .../migrate_repo/versions/001_base_schema.py       |   11 +---
 melange/ipam/models.py                             |   53 ----------------
 melange/tests/factories/models.py                  |   11 ---
 melange/tests/unit/test_ipam_models.py             |   66 +-------------------
 5 files changed, 4 insertions(+), 139 deletions(-)

commit 5124d08b8fb90777564c4beca88150a4eee2fbee
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Wed Oct 12 15:39:54 2011 +0530

    Vinkesh | Added shared_ips table. Added Interface model to deal with sharing of ips

 melange/db/sqlalchemy/mappers.py                   |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   11 +++-
 melange/ipam/models.py                             |   53 ++++++++++++++++
 melange/tests/factories/models.py                  |   11 +++
 melange/tests/unit/test_ipam_models.py             |   66 +++++++++++++++++++-
 5 files changed, 139 insertions(+), 4 deletions(-)

commit 73ff3e9003fca8fc1a109208dcf3e6df5318e619
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 7 17:36:05 2011 +0530

    Rajaram/Vinkesh|Added queue based prefetching of ip addresses

 melange/ipv4/queue_based_ip_generator.py     |   42 +++++++++++++++++
 melange/tests/functional/test_ip_prefetch.py |   62 ++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 0 deletions(-)

commit 17c640f2f8c78334a75754377544b270034657c6
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 7 11:00:56 2011 +0530

    Rajaram/Vinkesh|fixed pep8 issues

 melange/ipam/service.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit f773f6678f54f627e2f05836130b1e58446b1054
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Oct 7 10:07:11 2011 +0530

    misc changes after rebase from master while moving from bzr

 Authors                   |    3 +++
 melange/ipam/scheduler.py |   40 ----------------------------------------
 run_tests.sh              |    1 +
 tools/install_venv.py     |    2 ++
 tools/pip-requires        |    4 +++-
 tools/with_venv.sh        |   17 -----------------
 6 files changed, 9 insertions(+), 58 deletions(-)

commit f0c8627e9bea1beb1b9defd400220fb28d202065
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Oct 5 16:50:35 2011 +0530

    Vinkesh/Rajaram|moved ipv4 generation algo to a plugable module

 melange/common/exception.py             |    5 +++
 melange/ipam/models.py                  |   43 +++++++++++-----------------
 melange/ipam/service.py                 |    2 +-
 melange/ipv4/__init__.py                |   22 +++++++++++++++
 melange/ipv4/db_based_ip_generator.py   |   46 +++++++++++++++++++++++++++++++
 melange/tests/unit/test_ipam_models.py  |   12 ++++----
 melange/tests/unit/test_ipam_service.py |    2 +-
 7 files changed, 98 insertions(+), 34 deletions(-)

commit a3a7641ddce557c80b2496355ef9c1e63f971c9a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Oct 5 14:19:54 2011 +0530

    Rajaram/Vinkesh|Changed ip allocation algo to not load all allocated ips at once

 melange/db/sqlalchemy/api.py                       |   10 +++++
 melange/db/sqlalchemy/mappers.py                   |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   12 ++++-
 melange/ipam/models.py                             |   41 +++++++++++++++----
 melange/tests/factories/models.py                  |   10 +++++
 melange/tests/unit/test_ipam_models.py             |   18 +++++++++
 6 files changed, 81 insertions(+), 12 deletions(-)

commit 9d946900379de9cdac7479b0f30b818213520565
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Sep 30 15:28:58 2011 +0530

    Vinkesh | Displaying an error message which asks users to provide a tenant_id in CLI if needed

 bin/melange-client                   |    8 +++++
 melange/ipam/client.py               |   57 ++++++++++++++-------------------
 melange/tests/functional/test_cli.py |    7 ++++
 3 files changed, 39 insertions(+), 33 deletions(-)

commit 67a29d99f0366847218e282b814ef4dfde9f1cb6
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Sep 30 14:21:35 2011 +0530

    Vinkesh | Validating  gateway address is a valid address before IpBlock create/update

 melange/ipam/models.py                  |   12 +++++++++++-
 melange/ipam/service.py                 |    4 ++--
 melange/tests/unit/test_ipam_models.py  |   16 ++++++++++++++++
 melange/tests/unit/test_ipam_service.py |    2 +-
 4 files changed, 30 insertions(+), 4 deletions(-)

commit 484ac4d30c2bf26ae4ac441a6adff831124f4154
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Sep 29 15:16:32 2011 +0530

    Rajaram/Vinkesh | Added ip_routes in ip_allocations' payload

 melange/ipam/models.py                  |    3 +
 melange/ipam/service.py                 |    9 ++--
 melange/ipam/views.py                   |   64 ++++++++++++++++++++++++++++
 melange/tests/unit/test_ipam_models.py  |   10 ++++
 melange/tests/unit/test_ipam_service.py |   37 +++++++++-------
 melange/tests/unit/test_ipam_views.py   |   69 +++++++++++++++++++++++++++++++
 6 files changed, 172 insertions(+), 20 deletions(-)

commit 47e1853c678a285fd9d8905a357cbf01e35f64d0
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Sep 29 11:38:33 2011 +0530

    Rajaram/Vinkesh | Added CLI for IpRoute

 bin/melange-client                      |    1 +
 melange/ipam/client.py                  |   31 ++++++++++++++++++
 melange/ipam/models.py                  |    2 +
 melange/tests/functional/test_cli.py    |   53 +++++++++++++++++++++++++++++-
 melange/tests/unit/test_ipam_models.py  |    8 +++++
 melange/tests/unit/test_ipam_service.py |    2 +-
 6 files changed, 94 insertions(+), 3 deletions(-)

commit 10e6334958c1c311f830cc63a6b931dfa3273f67
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Wed Sep 28 18:30:46 2011 +0530

    Rajaram/Vinkesh | Exposed CRUD APIs for ip_routes

 melange/ipam/service.py                 |   50 ++++++++-
 melange/tests/unit/test_ipam_service.py |  191 ++++++++++++++++++++++++++++++-
 2 files changed, 235 insertions(+), 6 deletions(-)

commit 1b94bc7df1abea1a9f1a068a600e697bf4399e87
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Wed Sep 28 15:35:05 2011 +0530

    Rajaram/Vinkesh | Added IpRoute model. Started using melange.conf.sample for tests

 bin/melange-delete-deallocated-ips                 |    1 +
 etc/melange/melange.conf.sample                    |    2 +-
 etc/melange/melange.conf.test                      |   64 --------------------
 melange/db/sqlalchemy/mappers.py                   |    2 +
 .../migrate_repo/versions/001_base_schema.py       |   34 +++++++----
 melange/ipam/models.py                             |    8 +++
 melange/tests/factories/models.py                  |   10 +++-
 melange/tests/functional/__init__.py               |   24 ++++----
 melange/tests/functional/server.py                 |    9 ++-
 melange/tests/functional/test_cli.py               |   18 ++++--
 melange/tests/unit/__init__.py                     |    4 +-
 melange/tests/unit/test_extensions.py              |    2 +-
 melange/tests/unit/test_ipam_models.py             |   40 ++++++++++++
 melange/tests/unit/test_ipam_service.py            |    2 +-
 melange/tests/unit/test_versions.py                |    2 +-
 15 files changed, 117 insertions(+), 105 deletions(-)

commit 80bd7418813879b605a1792a1c8f6d608f549b75
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Mon Sep 26 16:33:44 2011 +0530

    Rajaram/Vinkesh | AllocatedIps index now does not show deallocated IPs

 melange/db/sqlalchemy/api.py            |   36 ++++++++++++++++++++----------
 melange/ipam/models.py                  |   27 ++++++++++++++--------
 melange/ipam/service.py                 |    2 +-
 melange/tests/unit/test_ipam_models.py  |   14 ++++++++++++
 melange/tests/unit/test_ipam_service.py |   12 ++++++++++
 5 files changed, 68 insertions(+), 23 deletions(-)

commit 6fb912a4f676ebd191b29ef05612553fa8a2eac5
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Sep 23 12:26:04 2011 +0530

    Rajaram/Vinkesh | Added retries while allocating ips to fix concurrency problem

 etc/melange/melange.conf.sample         |    3 +
 etc/melange/melange.conf.test           |    3 +
 melange/common/exception.py             |    5 ++
 melange/db/sqlalchemy/api.py            |   14 ++++--
 melange/ipam/models.py                  |   71 ++++++++++++++++++++++--------
 melange/ipam/service.py                 |    1 +
 melange/tests/unit/test_auth.py         |    8 ++--
 melange/tests/unit/test_ipam_models.py  |   62 ++++++++++++++++++++++++++-
 melange/tests/unit/test_ipam_service.py |    1 +
 9 files changed, 140 insertions(+), 28 deletions(-)

commit e8124bc5697de80066823410badeb0fb133a165a
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Sep 22 16:56:34 2011 +0530

    Rajaram/Vinkesh | Consolidated migrations. Removed soft delete

 melange/db/sqlalchemy/api.py                       |   20 ++--
 .../versions/001_add_ip_blocks_table.py            |   48 --------
 .../migrate_repo/versions/001_base_schema.py       |  114 ++++++++++++++++++++
 .../versions/002_add_ip_addresses_table.py         |   54 ---------
 .../versions/003_add_type_to_ip_blocks.py          |   33 ------
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   56 ----------
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |   37 -------
 .../006_add_deallocated_to_ip_addresses.py         |   35 ------
 .../migrate_repo/versions/007_add_policy_table.py  |   51 ---------
 .../versions/008_add_ip_ranges_table.py            |   55 ----------
 .../versions/009_add_policy_id_to_ip_blocks.py     |   38 -------
 .../versions/010_add_ip_octets_table.py            |   54 ---------
 .../versions/011_add_tenant_id_to_ip_blocks.py     |   33 ------
 .../versions/012_add_tenant_id_to_policies.py      |   33 ------
 .../versions/013_add_parent_id_to_ip_blocks.py     |   36 ------
 .../versions/014_add_is_full_to_ip_blocks.py       |   35 ------
 ..._gateway_and_broadcast_addresses_to_ip_block.py |   38 -------
 .../016_add_deallocated_at_to_ip_addresses.py      |   34 ------
 ...broadcast_address_and_rename_gateway_address.py |   37 -------
 .../versions/018_add_dns_fields_to_ip_blocks.py    |   36 ------
 ..._by_tenant_and_device_column_in_ip_addresses.py |   36 ------
 melange/tests/unit/test_sqlalchemy_api.py          |   45 --------
 22 files changed, 123 insertions(+), 835 deletions(-)

commit 19f34dedb06816c2b0f3b1cc689494aa060b509a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 20 17:43:48 2011 +0530

    Rajaram/Vinkesh| fixed bug in melange-delete-deallocated-ips where it wasnt loading the config file

 bin/melange                             |    2 +-
 bin/melange-delete-deallocated-ips      |    2 +-
 bin/melange-manage                      |    2 +-
 etc/melange/melange.conf.sample         |    3 +++
 melange/common/config.py                |   14 ++++++++++++--
 melange/ipam/models.py                  |    2 +-
 melange/ipam/service.py                 |    3 ---
 melange/tests/functional/__init__.py    |    4 ++--
 melange/tests/functional/test_cli.py    |   25 +++++++++++++++++++++++++
 melange/tests/unit/__init__.py          |    5 ++---
 melange/tests/unit/test_extensions.py   |    2 +-
 melange/tests/unit/test_ipam_service.py |    2 +-
 melange/tests/unit/test_versions.py     |    2 +-
 13 files changed, 51 insertions(+), 17 deletions(-)

commit c760a91ec580752da4967354d888036e3d7fae4a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Sep 15 13:01:58 2011 +0530

    Rajaram/Vinkesh | Cleaned up the code a bit. Small style fixes

 melange/common/auth.py                  |    1 +
 melange/common/config.py                |    2 +-
 melange/common/exception.py             |    7 ++-
 melange/common/utils.py                 |    2 +-
 melange/common/wsgi.py                  |    4 +-
 melange/db/sqlalchemy/api.py            |   25 +++---
 melange/db/sqlalchemy/mappers.py        |    7 ++
 melange/db/sqlalchemy/migration.py      |   12 ++--
 melange/db/sqlalchemy/session.py        |   21 ++---
 melange/ipam/client.py                  |   53 ++++++++----
 melange/ipam/models.py                  |  134 +++++++++++++++----------------
 melange/ipam/service.py                 |   38 +++++----
 melange/ipv6/__init__.py                |   20 +++++
 melange/tests/__init__.py               |    5 +-
 melange/tests/unit/test_ipam_models.py  |   58 +-------------
 melange/tests/unit/test_ipam_service.py |   14 ++--
 melange/tests/unit/test_ipv6.py         |   59 ++++++++++++++
 17 files changed, 257 insertions(+), 205 deletions(-)

commit b4cc6224a74504c3978ce12f681e3ed3432557ae
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Sep 14 15:55:46 2011 +0530

    Rajaram/Vinkesh | Removed some unused code. Added few tests. Miscellaneous small refactoring

 melange/common/client.py                 |   22 ++++---------
 melange/common/exception.py              |    6 ++++
 melange/common/pagination.py             |   11 +------
 melange/ipam/models.py                   |   39 ++++--------------------
 melange/ipam/service.py                  |   12 ++-----
 melange/tests/functional/__init__.py     |    4 +-
 melange/tests/functional/test_service.py |   25 ++++++++++-----
 melange/tests/unit/test_auth.py          |   48 +++++++++++++++++++----------
 melange/tests/unit/test_ipam_models.py   |   46 +++++++++++++++++-----------
 melange/tests/unit/test_wsgi.py          |    3 --
 10 files changed, 102 insertions(+), 114 deletions(-)

commit 2197867025e97d201b7531aabfd8f327e9dc3505
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 13 18:48:16 2011 +0530

    Rajaram/Vinkesh | Added CLI commands for ip_address

 bin/melange-client                     |    1 +
 melange/ipam/client.py                 |   29 +++++++++++++++++
 melange/tests/factories/models.py      |    8 +++-
 melange/tests/functional/test_cli.py   |   54 ++++++++++++++++++++++++++++++++
 melange/tests/unit/test_ipam_models.py |    1 +
 5 files changed, 91 insertions(+), 2 deletions(-)

commit b885fa4e929e634d55711613c82a1bbc18165a14
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 13 16:25:53 2011 +0530

    Rajaram/Vinkesh|added route to search for allocated ip addresses

 bin/melange-client                       |    1 +
 melange/ipam/client.py                   |   31 +++++++++++---
 melange/ipam/service.py                  |   20 +++++++++
 melange/tests/__init__.py                |    4 ++
 melange/tests/functional/__init__.py     |    9 ----
 melange/tests/functional/test_cli.py     |   29 +++++++++++++
 melange/tests/functional/test_service.py |   13 +++++-
 melange/tests/unit/test_ipam_service.py  |   65 ++++++++++++++++++++++++++++++
 8 files changed, 154 insertions(+), 18 deletions(-)

commit d410155a5bc5cc6e8cb869ecc39c5b2143afb5ac
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 13 12:19:00 2011 +0530

    Rajaram/Vinkesh | Non Tenanted resources can only be accessed by admins

 melange/common/auth.py          |   11 ++++++-----
 melange/tests/unit/test_auth.py |   12 ++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

commit 4cbd5809f1a5768fb5d9402046125cfb34ba4c1a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Sep 12 18:28:44 2011 +0530

    Rajaram/Vinkesh|nat resources in api are tenant scoped

 etc/melange/melange.conf.sample         |    1 -
 melange/ipam/models.py                  |    4 +-
 melange/ipam/service.py                 |   47 ++++---
 melange/tests/unit/test_ipam_models.py  |   15 ++-
 melange/tests/unit/test_ipam_service.py |  234 ++++++++++++++++++++++++-------
 5 files changed, 224 insertions(+), 77 deletions(-)

commit 1cf799f5a622f07655602c035faeb10d60942b78
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Sep 12 15:14:18 2011 +0530

    Vinkesh/Rajaram|Removed admin actions as after removing non tenant scoped resources, we dont have any admin actions

 melange/common/auth.py          |   21 +---------------
 melange/common/wsgi.py          |    7 +----
 melange/ipam/service.py         |    4 ---
 melange/tests/unit/test_auth.py |   50 +--------------------------------------
 4 files changed, 3 insertions(+), 79 deletions(-)

commit 322ca4bdcb18f31db7951fff07602c06ecdabbb1
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Sep 12 15:08:34 2011 +0530

    Vinkesh/Rajaram|Removed non tenanted resources from api

 bin/melange-client                       |    6 +-
 melange/ipam/client.py                   |   15 +-
 melange/ipam/models.py                   |   35 +-
 melange/ipam/service.py                  |  211 +++---
 melange/tests/factories/models.py        |    4 +-
 melange/tests/functional/test_cli.py     |  240 ++-----
 melange/tests/functional/test_service.py |   10 +-
 melange/tests/unit/test_ipam_models.py   |   82 +--
 melange/tests/unit/test_ipam_service.py  | 1091 +++++++++++++-----------------
 9 files changed, 685 insertions(+), 1009 deletions(-)

commit bcfdbb253a9f3ba7147cbc00ee2dfae94aa4e372
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Sep 9 17:17:00 2011 +0530

    Rajaram/Vinkesh|ipaddress now stores used_by_tenant to denote tenant using the ipaddress and used_by_device for the instance on which the ip_address is allocated

 melange/common/exception.py                        |    2 -
 melange/common/pagination.py                       |    2 -
 ..._by_tenant_and_device_column_in_ip_addresses.py |   36 ++++++++++++++
 melange/ipam/models.py                             |   20 +++++---
 melange/ipam/service.py                            |    6 ++-
 melange/ipv6/tenant_based_generator.py             |    4 +-
 melange/tests/unit/test_ipam_models.py             |   33 ++++++++-----
 melange/tests/unit/test_ipam_service.py            |   52 ++++++++++++++------
 .../tests/unit/test_tenant_based_ipv6_generator.py |    6 +-
 9 files changed, 114 insertions(+), 47 deletions(-)

commit 49e4ac3930ce7fa6657bc382ba301248969d30af
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Sep 9 12:03:09 2011 +0530

    Vinkesh/Rajaram|Removed extensions code and started using openstack common's extension code

 etc/melange/melange.conf.sample             |    2 +-
 etc/melange/melange.conf.test               |    4 +-
 melange/common/extensions.py                |  431 +--------------------------
 melange/tests/unit/extensions/__init__.py   |   15 -
 melange/tests/unit/extensions/foxinsocks.py |   99 ------
 melange/tests/unit/test_extensions.py       |  201 +------------
 6 files changed, 23 insertions(+), 729 deletions(-)

commit 18f87b1992789d9b33fddc68b3a904e2364daac6
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Sep 8 18:32:37 2011 +0530

    Rajaram/Vinkesh | Removed overridden get_content_type in wsgi.Request class

 melange/common/wsgi.py          |   15 +++------------
 melange/tests/unit/test_wsgi.py |   16 ----------------
 2 files changed, 3 insertions(+), 28 deletions(-)

commit e46250769315c180118161786fe6086c9429a49c
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Wed Sep 7 17:38:50 2011 +0530

    Vinkesh/Rajaram| Added tests for melange-manage db_sync and db_upgrade commands

 melange/tests/functional/test_cli.py |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit d42b1bdd93f20aecb57b1eea0b9c9441a4c97d71
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Sep 7 17:32:54 2011 +0530

    Vinkesh/Rajaram|changed wsgi in melange.common to use serializers from openstack.common

 melange/common/wsgi.py                   |  212 ++++++------------------------
 melange/tests/functional/test_service.py |   16 ++-
 melange/tests/unit/__init__.py           |    4 +-
 melange/tests/unit/test_extensions.py    |    8 +-
 4 files changed, 57 insertions(+), 183 deletions(-)

commit 896827055e16f06f2053f2701958f8fa1158fa17
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 6 14:58:20 2011 +0530

    Vinkesh\Rajaram|made keystone auth optional in melange-client

 bin/melange-client     |   18 ++++++++++++------
 melange/ipam/client.py |    5 +++--
 2 files changed, 15 insertions(+), 8 deletions(-)

commit e883bc2a7c2ba69231827e66264e5492f35f5ca0
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 6 11:34:26 2011 +0530

    Rajaram/Vinkesh | Made MelangeError a  subclass of openstack common's OpenstackException, removed usages of merge_dicts

 melange/common/exception.py      |   11 +++++------
 melange/common/pagination.py     |   12 ++++++------
 melange/common/utils.py          |    7 -------
 melange/ipam/models.py           |   38 ++++++++++++--------------------------
 melange/tests/__init__.py        |    2 +-
 melange/tests/unit/test_utils.py |   11 -----------
 6 files changed, 24 insertions(+), 57 deletions(-)

commit f61c3b941b754336916f96de23ce361da73015b9
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Sep 6 10:01:10 2011 +0530

    Rajaram/Vinkesh | Changed openstack.common imports in melange common to module level labels

 bin/melange                 |    1 +
 bin/melange-client          |    2 ++
 bin/melange-manage          |    2 +-
 melange/common/config.py    |   16 ++++++++++------
 melange/common/exception.py |   10 +++++++---
 melange/common/utils.py     |    8 ++++++--
 melange/common/wsgi.py      |    5 ++++-
 7 files changed, 31 insertions(+), 13 deletions(-)

commit b4c9a33735d9861350998d07601d6c2be6e8c743
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Sep 5 18:49:18 2011 +0530

    Rajaram/Vinkesh|fixed more imports to import  only modules and misc style improvements

 bin/melange                                        |    5 +-
 bin/melange-client                                 |   16 +-
 bin/melange-delete-deallocated-ips                 |   15 +-
 bin/melange-manage                                 |    4 +-
 melange/common/auth.py                             |    2 +-
 melange/common/exception.py                        |    2 +-
 melange/common/extensions.py                       |    3 +
 melange/common/utils.py                            |    8 +-
 melange/common/wsgi.py                             |   20 +-
 melange/db/__init__.py                             |   10 +-
 melange/db/sqlalchemy/api.py                       |    2 +-
 melange/db/sqlalchemy/mappers.py                   |    4 +-
 melange/db/sqlalchemy/migrate_repo/__init__.py     |    2 -
 melange/db/sqlalchemy/migrate_repo/manage.py       |    2 +-
 melange/db/sqlalchemy/migrate_repo/migrate.cfg     |    1 +
 melange/db/sqlalchemy/migrate_repo/schema.py       |    4 +-
 melange/ipam/models.py                             |   44 +-
 melange/ipam/service.py                            |   11 +-
 melange/ipv6/rfc2462_generator.py                  |   16 +-
 melange/ipv6/tenant_based_generator.py             |   16 +-
 melange/tests/__init__.py                          |   14 +-
 melange/tests/factories/models.py                  |   11 +-
 melange/tests/functional/test_cli.py               |    5 +-
 melange/tests/unit/test_auth.py                    |   12 +-
 melange/tests/unit/test_extensions.py              |    1 +
 melange/tests/unit/test_ipam_models.py             |  309 +++++-----
 melange/tests/unit/test_ipam_service.py            |  622 +++++++++++---------
 melange/tests/unit/test_rfc2462_ipv6_generator.py  |    8 +-
 melange/tests/unit/test_sqlalchemy_api.py          |   22 +-
 .../tests/unit/test_tenant_based_ipv6_generator.py |   32 +-
 melange/tests/unit/test_versions.py                |   21 +-
 melange/tests/unit/test_wsgi.py                    |   51 +-
 32 files changed, 707 insertions(+), 588 deletions(-)

commit c23dc3933bee220d117b675a0f5ea4ddd765b978
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Sep 5 14:19:05 2011 +0530

    Vinkesh/Rajaram| Fixes as per Brain's comments:
    1. :moved gettext.install to melange/__init__
    2. melange-client raises errros only on option.verbose
    3. Used urlparse.urljoin where applicable
    4. Fixed version in bin/melange* scripts
    and other misc fixes according to HACKING or style recomendations

 bin/melange                        |    6 +++---
 bin/melange-client                 |    6 ++++--
 bin/melange-delete-deallocated-ips |    2 --
 bin/melange-manage                 |   10 +++++-----
 melange/__init__.py                |    3 +++
 melange/common/auth.py             |   11 ++++++-----
 melange/common/client.py           |    4 ++--
 melange/common/utils.py            |    1 -
 melange/db/sqlalchemy/mappers.py   |    1 +
 melange/ipam/client.py             |    3 ++-
 melange/ipam/models.py             |    5 ++---
 melange/tests/unit/test_auth.py    |   17 ++++++++++++-----
 melange/version.py                 |   19 ++-----------------
 13 files changed, 42 insertions(+), 46 deletions(-)

commit 459aa9bdeee6f9368439d2e4d76dece3ec56ec41
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Sep 2 18:55:12 2011 +0530

    Rajaram|missed a couple of pep8 voilations

 bin/melange        |    2 +-
 bin/melange-client |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

commit 52fb2dadb17dbe2421fc85c629d335edee2d691f
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Sep 2 18:51:41 2011 +0530

    Rajaram| Newline between imports and copyright header, imports only import modules, doc strings as per HACKING guide

 bin/melange                                 |    7 +-
 bin/melange-client                          |   57 +-
 bin/melange-delete-deallocated-ips          |    7 +-
 bin/melange-manage                          |   15 +-
 melange/__init__.py                         |    1 +
 melange/common/auth.py                      |   12 +-
 melange/common/client.py                    |    5 +-
 melange/common/config.py                    |    5 +-
 melange/common/exception.py                 |    6 +-
 melange/common/extensions.py                |    2 +
 melange/common/pagination.py                |   11 +-
 melange/common/utils.py                     |   20 +-
 melange/common/wsgi.py                      |  100 ++--
 melange/db/__init__.py                      |   13 +-
 melange/db/sqlalchemy/api.py                |   40 +-
 melange/db/sqlalchemy/mappers.py            |   34 +-
 melange/db/sqlalchemy/migration.py          |   14 +-
 melange/db/sqlalchemy/session.py            |    1 +
 melange/ipam/client.py                      |    1 +
 melange/ipam/models.py                      |   62 +-
 melange/ipam/service.py                     |  173 +++---
 melange/ipv6/rfc2462_generator.py           |    1 +
 melange/ipv6/tenant_based_generator.py      |    1 +
 melange/tests/__init__.py                   |   10 +-
 melange/tests/functional/__init__.py        |   35 +-
 melange/tests/functional/server.py          |    1 +
 melange/tests/functional/test_cli.py        |  167 +++---
 melange/tests/functional/test_service.py    |    7 +-
 melange/tests/unit/__init__.py              |   17 +-
 melange/tests/unit/extensions/foxinsocks.py |    7 +-
 melange/tests/unit/test_auth.py             |   51 +-
 melange/tests/unit/test_config.py           |   29 +-
 melange/tests/unit/test_extensions.py       |   16 +-
 melange/tests/unit/test_ipam_models.py      |  937 +++++++++++++++------------
 melange/versions.py                         |   10 +-
 35 files changed, 1008 insertions(+), 867 deletions(-)

commit f1b3e5f9a6d025bb2ea90c7543dd4b6e979b36fc
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 30 14:25:34 2011 +0530

    Rajaram/Vinkesh| refactored the wsgi.resource code and removed usages of serialization_metadata

 melange/common/pagination.py            |    9 ----
 melange/common/wsgi.py                  |   79 +++++++++++++++++++------------
 melange/ipam/service.py                 |   14 +++--
 melange/tests/unit/test_ipam_service.py |    1 -
 melange/tests/unit/test_versions.py     |   25 +++++++++-
 melange/tests/unit/test_wsgi.py         |   30 ++++++++++++
 melange/versions.py                     |   46 ++++++++++++------
 7 files changed, 140 insertions(+), 64 deletions(-)

commit 9484ad2598a2181845a51c5ad481473bcd66190e
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Aug 29 16:38:53 2011 +0530

    Rajaram/Vinkesh|moved to openstack.common.wsgi.Resource

 melange/common/extensions.py            |   30 ++++----
 melange/common/wsgi.py                  |  132 +++++++++++++++----------------
 melange/ipam/service.py                 |   91 +++++++++++----------
 melange/tests/unit/test_auth.py         |    3 +-
 melange/tests/unit/test_extensions.py   |    2 +-
 melange/tests/unit/test_ipam_service.py |   45 +++++------
 melange/tests/unit/test_wsgi.py         |   32 +-------
 melange/versions.py                     |    3 +-
 8 files changed, 154 insertions(+), 184 deletions(-)

commit 71f8abe02ac0ca23fe180219a56d78388537ab1f
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Aug 26 10:01:52 2011 +0530

    Rajaram/Vinkesh| updated readme file

 melange/README |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

commit 5baba05e0c898d94c061e321c9d22735c30dc6db
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Aug 25 16:39:50 2011 +0530

    Rajaram/Vinkesh|moved extensions folder inside melange

 etc/melange/melange.conf.sample |    2 +-
 extensions/__init__.py          |   15 ---------------
 melange/extensions/__init__.py  |   16 ++++++++++++++++
 3 files changed, 17 insertions(+), 16 deletions(-)

commit cbd90412199c7a736de0d1cbd6ee3e6c9f99a595
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Aug 25 14:50:09 2011 +0530

    Rajaram/Vinkesh | Switched to sqlite for tests. Cleaned up migration scripts.

 bin/melange                                        |    3 +-
 bin/melange-client                                 |   35 +---------------
 bin/melange-delete-deallocated-ips                 |   12 ++---
 bin/melange-manage                                 |    6 +--
 etc/melange/melange.conf.sample                    |    2 +-
 etc/melange/melange.conf.test                      |    2 +-
 melange/common/utils.py                            |    5 +--
 melange/common/wsgi.py                             |    1 +
 melange/db/sqlalchemy/mappers.py                   |   17 --------
 melange/db/sqlalchemy/migrate_repo/schema.py       |   43 --------------------
 .../versions/001_add_ip_blocks_table.py            |    9 +---
 .../versions/002_add_ip_addresses_table.py         |   10 +----
 .../versions/003_add_type_to_ip_blocks.py          |    8 ----
 .../migrate_repo/versions/004_add_ip_nat_table.py  |    9 +----
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |    8 ----
 .../006_add_deallocated_to_ip_addresses.py         |    8 ----
 .../migrate_repo/versions/007_add_policy_table.py  |   11 +----
 .../versions/008_add_ip_ranges_table.py            |   14 +-----
 .../versions/009_add_policy_id_to_ip_blocks.py     |   10 -----
 .../versions/010_add_ip_octets_table.py            |   14 +-----
 .../versions/011_add_tenant_id_to_ip_blocks.py     |    8 ----
 .../versions/012_add_tenant_id_to_policies.py      |    7 ---
 .../versions/013_add_parent_id_to_ip_blocks.py     |    1 -
 .../versions/014_add_is_full_to_ip_blocks.py       |   11 -----
 ..._gateway_and_broadcast_addresses_to_ip_block.py |   11 -----
 .../016_add_deallocated_at_to_ip_addresses.py      |    8 ----
 ...broadcast_address_and_rename_gateway_address.py |    8 ----
 .../versions/019_rename_port_to_interface.py       |   43 --------------------
 melange/db/sqlalchemy/session.py                   |    2 +-
 melange/ipam/models.py                             |   36 ++++++++--------
 melange/tests/unit/test_ipam_service.py            |   31 +++++----------
 31 files changed, 55 insertions(+), 338 deletions(-)

commit 54c93268d087667544f77fb7260194277b978019
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Aug 24 16:48:55 2011 +0530

    Rajaram/Vinkesh | Renamed utils.Method to utils.MethodInspector. Removed unecessary bzrignore entries

 bin/melange-client               |    4 ++--
 bin/melange-manage               |    4 ++--
 melange/common/utils.py          |    2 +-
 melange/tests/unit/test_utils.py |   14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

commit b387e31cc49c717971622c1a61b85285da6b99ab
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Aug 24 16:10:42 2011 +0530

    Rajaram/Vinkesh | Simplified models mapping in db api

 bin/melange                          |    2 -
 melange/common/utils.py              |   32 -----------------
 melange/db/sqlalchemy/api.py         |   62 ++++++++++++++-------------------
 melange/db/sqlalchemy/session.py     |   23 ++-----------
 melange/ipam/models.py               |    2 +-
 melange/tests/functional/__init__.py |    2 -
 melange/tests/unit/__init__.py       |    1 -
 7 files changed, 30 insertions(+), 94 deletions(-)

commit df77e68264758fc331216528b3f6bbce130373c6
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Aug 24 12:24:38 2011 +0530

    Rajaram/Vinkesh | extracted melange client code from CLI to ipam/client. Removed unnecessary bzrignore.

 bin/melange-client                   |  253 ++++++---------------------------
 melange/common/client.py             |   11 +-
 melange/ipam/client.py               |  178 ++++++++++++++++++++++++
 melange/tests/functional/__init__.py |    4 +-
 melange/tests/functional/test_cli.py |    1 +
 5 files changed, 234 insertions(+), 213 deletions(-)

commit ab24b6a744da3f0f779a51c58f99fb3e335d2829
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 23 16:21:18 2011 +0530

    Rajaram/Vinkesh | moved common/data_types.py to Converter class in models.py to remove confusion caused by the Integer and Boolean methods

 melange/common/data_types.py           |   38 ------------
 melange/ipam/models.py                 |   28 ++++++---
 melange/tests/unit/test_data_types.py  |   40 -------------
 melange/tests/unit/test_ipam_models.py |   97 ++++++++++++++++----------------
 4 files changed, 67 insertions(+), 136 deletions(-)

commit 636f7f66b5b712063fec1a0a56c679d2b0f6fac2
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 23 15:04:30 2011 +0530

    Rajaram/Vinkesh | Removed usages of mutable default arguments

 melange/common/client.py                |   14 ++++++++++----
 melange/common/wsgi.py                  |    3 ++-
 melange/ipam/models.py                  |    2 +-
 melange/ipam/service.py                 |    5 ++---
 melange/tests/unit/test_auth.py         |    2 +-
 melange/tests/unit/test_extensions.py   |    4 ++--
 melange/tests/unit/test_ipam_service.py |    2 +-
 melange/tests/unit/test_wsgi.py         |    2 +-
 melange/versions.py                     |    5 ++---
 9 files changed, 22 insertions(+), 17 deletions(-)

commit 2c590dd359f9c95151afc25c7eba2d66d74c6324
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 23 14:12:30 2011 +0530

    Vinkesh/Rajaram|fixed gettext to work like in nova as per Rick Harris' suggestion

 bin/melange                        |    2 ++
 bin/melange-client                 |    4 +++-
 bin/melange-delete-deallocated-ips |   12 ++++++++++++
 bin/melange-manage                 |    4 +++-
 melange/common/auth.py             |    1 -
 melange/common/client.py           |    1 -
 melange/common/extensions.py       |    1 -
 melange/common/wsgi.py             |    1 -
 melange/ipam/models.py             |    1 -
 9 files changed, 20 insertions(+), 7 deletions(-)

commit c7c62f2f45cc6388272c22d3809cae2bd44faeb2
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 23 11:03:41 2011 +0530

    Rajaram/Vinkesh | Fixed some pep8 errors

 bin/melange-manage                                 |   16 +++++++++-------
 .../006_add_deallocated_to_ip_addresses.py         |    3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

commit 212a96decaffb64ef345cbbf3d9b5c814c89edb7
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 23 10:39:55 2011 +0530

    Rajaram/Vinkesh | Renamed melange-manage to melange-client. Added db sync, upgrade and downgrade commands in melange-manage

 bin/melange                                        |    6 +-
 bin/melange-client                                 |  375 ++++++++++++++++++++
 bin/melange-manage                                 |  374 ++++----------------
 melange/common/config.py                           |    1 +
 melange/db/sqlalchemy/api.py                       |    8 +
 .../versions/003_add_type_to_ip_blocks.py          |    2 +-
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |    6 +-
 .../006_add_deallocated_to_ip_addresses.py         |    2 +-
 .../versions/009_add_policy_id_to_ip_blocks.py     |    2 +-
 .../versions/011_add_tenant_id_to_ip_blocks.py     |    2 +-
 .../versions/012_add_tenant_id_to_policies.py      |    2 +-
 .../versions/013_add_parent_id_to_ip_blocks.py     |    2 +-
 .../versions/014_add_is_full_to_ip_blocks.py       |    2 +-
 .../016_add_deallocated_at_to_ip_addresses.py      |    2 +-
 .../versions/018_add_dns_fields_to_ip_blocks.py    |    4 +-
 melange/tests/functional/__init__.py               |   10 +-
 melange/tests/functional/test_cli.py               |    2 +-
 17 files changed, 469 insertions(+), 333 deletions(-)

commit cc3b62c5ced082e263cc08368d9cb49850ac7fe7
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Aug 22 15:48:32 2011 +0530

    Rajaram/Vinkesh|some more misc cleanup to use openstack-common project

 melange/common/utils.py |   78 ++++++++++++++++++----------------------------
 melange/common/wsgi.py  |   63 --------------------------------------
 2 files changed, 31 insertions(+), 110 deletions(-)

commit d1f69ef767b7bad4675da401fff76770f6c37772
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Aug 22 15:12:25 2011 +0530

    Rajaram/Vinkesh|used common framework code that exists in the openstack-common project

 melange/common/config.py    |  310 +------------------------------------------
 melange/common/exception.py |   78 +----------
 melange/common/utils.py     |   31 +----
 melange/common/wsgi.py      |  139 +-------------------
 tools/install_venv.py       |    4 +
 5 files changed, 15 insertions(+), 547 deletions(-)

commit 8f43419dc72cbbc32dc80de68c0ca3f7b7748985
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Aug 19 12:54:48 2011 +0530

    Santhosh/Deepak | Fixed bug where tenant_id was not being passed for allocating Ipv6 addresses through network controller.

 melange/ipam/models.py                  |   10 ++++++++++
 melange/ipam/service.py                 |   10 ++--------
 melange/tests/unit/test_ipam_models.py  |    6 ++++++
 melange/tests/unit/test_ipam_service.py |   16 +++++++++++-----
 4 files changed, 29 insertions(+), 13 deletions(-)

commit 5ddae5ec41660158d3921df3f55603d4694b3c68
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 17 14:11:17 2011 -0500

    fixed extra l in sqlite

 melange/db/sqlalchemy/migrate_repo/migrate.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2898f58e292976142a29bc295efa550321f7a31c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 17 14:06:25 2011 -0500

    correct copyright

 bin/melange-manage |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit 921899897e3e831e3498c18f3c416edbed6fee01
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 17 14:01:44 2011 -0500

    alphabetized melange imports

 bin/melange                                        |    4 +-
 bin/melange-delete-deallocated-ips                 |    4 +-
 bin/melange-manage                                 |   16 ++++---
 melange/common/auth.py                             |    7 +--
 melange/common/client.py                           |    4 +-
 melange/common/config.py                           |    5 +-
 melange/common/exception.py                        |    2 +-
 melange/common/extensions.py                       |    6 +-
 melange/common/pagination.py                       |    7 +--
 melange/common/wsgi.py                             |   22 +++++----
 melange/db/__init__.py                             |    2 +-
 melange/db/sqlalchemy/api.py                       |    6 ++-
 melange/db/sqlalchemy/mappers.py                   |   26 ++++++++--
 melange/db/sqlalchemy/migrate_repo/manage.py       |    2 +
 melange/db/sqlalchemy/migrate_repo/schema.py       |    3 +-
 .../versions/001_add_ip_blocks_table.py            |   15 ++++--
 .../versions/002_add_ip_addresses_table.py         |   18 +++++--
 .../versions/003_add_type_to_ip_blocks.py          |   17 +++++--
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   19 ++++++--
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |   16 +++++--
 .../006_add_deallocated_to_ip_addresses.py         |   16 +++++--
 .../migrate_repo/versions/007_add_policy_table.py  |   19 ++++++--
 .../versions/008_add_ip_ranges_table.py            |   19 ++++++--
 .../versions/009_add_policy_id_to_ip_blocks.py     |   21 ++++++--
 .../versions/010_add_ip_octets_table.py            |   19 ++++++--
 .../versions/011_add_tenant_id_to_ip_blocks.py     |   16 +++++--
 .../versions/012_add_tenant_id_to_policies.py      |   14 ++++-
 .../versions/013_add_parent_id_to_ip_blocks.py     |   10 +++-
 .../versions/014_add_is_full_to_ip_blocks.py       |   21 ++++++--
 ..._gateway_and_broadcast_addresses_to_ip_block.py |   21 ++++++--
 .../016_add_deallocated_at_to_ip_addresses.py      |   16 +++++--
 ...broadcast_address_and_rename_gateway_address.py |   16 +++++--
 .../versions/018_add_dns_fields_to_ip_blocks.py    |    7 ++-
 .../versions/019_rename_port_to_interface.py       |   16 +++++--
 melange/db/sqlalchemy/migration.py                 |    1 -
 melange/db/sqlalchemy/session.py                   |    6 +-
 melange/ipam/models.py                             |   18 ++++---
 melange/ipam/service.py                            |   26 +++++++----
 melange/ipv6/rfc2462_generator.py                  |    4 +-
 melange/ipv6/tenant_based_generator.py             |    4 +-
 melange/tests/__init__.py                          |    3 +-
 melange/tests/factories/models.py                  |    1 -
 melange/tests/functional/__init__.py               |   14 +++--
 melange/tests/functional/server.py                 |    3 +-
 melange/tests/functional/test_cli.py               |   17 ++++--
 melange/tests/unit/__init__.py                     |   39 ++-------------
 melange/tests/unit/extensions/foxinsocks.py        |    1 -
 melange/tests/unit/test_auth.py                    |   14 +++---
 melange/tests/unit/test_config.py                  |    1 +
 melange/tests/unit/test_data_types.py              |    1 +
 melange/tests/unit/test_extensions.py              |    8 ++--
 melange/tests/unit/test_ipam_models.py             |   49 ++++++++++++--------
 melange/tests/unit/test_ipam_service.py            |   39 ++++++++++------
 melange/tests/unit/test_pagination.py              |    6 ++-
 melange/tests/unit/test_rfc2462_ipv6_generator.py  |    5 +-
 melange/tests/unit/test_sqlalchemy_api.py          |   10 ++--
 .../tests/unit/test_tenant_based_ipv6_generator.py |    5 +-
 melange/tests/unit/test_utils.py                   |    2 +-
 melange/tests/unit/test_versions.py                |    5 +-
 melange/tests/unit/test_wsgi.py                    |   12 +++--
 melange/versions.py                                |    2 +-
 61 files changed, 458 insertions(+), 270 deletions(-)

commit 82af16cc5d9c8e6ca955280009dc8e0d5ec9289f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 17 11:27:15 2011 -0500

    moved double author to .mailmap

 .mailmap |    1 +
 Authors  |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

commit 14123225d4e8a6f73c5e4be49e2e563cc53d9fa8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 17 11:10:22 2011 -0500

    fixed pep8 issue

 melange/common/wsgi.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 87909998dfba702d4937a3f786ecdcbc4afe176d
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Aug 11 12:27:51 2011 +0530

    Deepak/Rajaram|renamed port to interface and moved to mysql for tests

 bin/melange-manage                                 |    5 +-
 etc/melange/melange.conf.sample                    |    2 +-
 etc/melange/melange.conf.test                      |    3 +-
 melange/README                                     |    5 +-
 melange/common/wsgi.py                             |    3 +-
 .../versions/019_rename_port_to_interface.py       |   35 +++++++++++
 melange/db/sqlalchemy/session.py                   |   16 +++---
 melange/ipam/models.py                             |   10 ++--
 melange/ipam/service.py                            |   23 ++++---
 melange/tests/unit/__init__.py                     |    5 --
 melange/tests/unit/test_ipam_models.py             |   27 ++++----
 melange/tests/unit/test_ipam_service.py            |   65 +++++++++++---------
 12 files changed, 119 insertions(+), 80 deletions(-)

commit 848c8c5d7a112868c48a98d7c9df71f84ecadded
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Aug 10 15:28:57 2011 +0530

    Rajaram/Santhosh | Tested IpBlock creation with the dns values

 melange/tests/unit/test_ipam_service.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

commit 87e5f62c5ef9d2bf71129ea03284f666a6e4a05e
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Aug 9 19:23:33 2011 +0530

    Rajaram|ip_allocations GET will give ip block details as well

 melange/ipam/service.py                 |    5 +++--
 melange/tests/unit/test_ipam_service.py |    5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

commit c461d0ee24bf0d73bb6688408da757427cc6a7d6
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Aug 9 19:20:32 2011 +0530

    Santhosh/Deepak | Added dns fields to ip block

 etc/melange/melange.conf.sample                    |    3 +-
 .../versions/018_add_dns_fields_to_ip_blocks.py    |   33 ++++++++++++++
 melange/ipam/models.py                             |    9 ++--
 melange/tests/factories/models.py                  |    2 +
 melange/tests/unit/test_ipam_models.py             |   45 +++++++------------
 5 files changed, 58 insertions(+), 34 deletions(-)

commit bdc21ca9d33be716fda3d87b7b2f7cde89963f2f
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Aug 8 17:29:23 2011 +0530

    Rajaram/Vinkesh | Added action to get all allocated ips on a network for a port

 melange/ipam/service.py                 |   16 +++++++++++++---
 melange/tests/unit/test_ipam_service.py |   16 ++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

commit 1205053d4a8c6b42764449e76978ba2fa8e4957b
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Aug 8 14:16:43 2011 +0530

    Santhosh/Deepak| Added test for deallocate ip when network doesnot exist

 melange/ipam/models.py                  |    1 +
 melange/ipam/service.py                 |    7 ++++---
 melange/tests/unit/test_ipam_models.py  |    4 ++--
 melange/tests/unit/test_ipam_service.py |    6 ++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

commit 6691896ec1597296f64c35612292f9569e29e047
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Aug 8 12:49:08 2011 +0530

    Santhosh/Deepak | Added api to deallocate ips for a port in a network

 melange/db/sqlalchemy/api.py            |    6 ++++++
 melange/ipam/models.py                  |   12 ++++++++++++
 melange/ipam/service.py                 |   23 ++++++++++++++++-------
 melange/tests/unit/test_ipam_models.py  |   24 ++++++++++++++++++++++++
 melange/tests/unit/test_ipam_service.py |   15 +++++++++++++--
 5 files changed, 71 insertions(+), 9 deletions(-)

commit b7cff7eb380cbb58b53ed6e3a2c24d34727db8ae
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Aug 5 16:17:12 2011 +0530

    Rajaram/Santhosh|ip address responses have versions now

 melange/ipam/models.py                  |    7 ++++++-
 melange/tests/unit/test_ipam_models.py  |    5 +++++
 melange/tests/unit/test_ipam_service.py |    4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

commit 4ecf8597d00d4d280e4ec9a0cb41af24a96dceab
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Aug 5 16:07:38 2011 +0530

    Vinkesh/Deepak | Validating gateway and braodcast ips are not allocatable

 melange/ipam/models.py                  |    7 ++-
 melange/tests/unit/test_ipam_models.py  |   66 +++++++++++++++++++++---------
 melange/tests/unit/test_ipam_service.py |   28 +++++++-------
 3 files changed, 65 insertions(+), 36 deletions(-)

commit ea870d0fa99b449aa65d79fd7b0ab06855da3f3f
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Aug 5 11:37:30 2011 +0530

    Deepak / Vinkesh | Sending ip_block details along with ip_address while allocating ips for a network

 melange/ipam/models.py                  |   24 +++++++-------
 melange/ipam/service.py                 |    2 +-
 melange/tests/unit/test_ipam_models.py  |   52 ++++++++++++++++++++++---------
 melange/tests/unit/test_ipam_service.py |   14 +++-----
 4 files changed, 56 insertions(+), 36 deletions(-)

commit e67c68ddd368ea7c92ecbd12b8bb02b8bcafa8f9
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Aug 5 10:46:35 2011 +0530

    Vinkesh/Deepak | Logging exceptions in request

 melange/common/wsgi.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

commit 2cf5db5a619baef75e7bf7d01ae891f3605f8486
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Aug 4 18:14:03 2011 +0530

    Fixed i18n formatting

 melange/common/auth.py       |    8 ++++----
 melange/common/client.py     |    2 +-
 melange/common/config.py     |   12 ++++++------
 melange/common/extensions.py |    4 ++--
 melange/common/wsgi.py       |    2 +-
 melange/ipam/models.py       |   34 +++++++++++++++++-----------------
 6 files changed, 31 insertions(+), 31 deletions(-)

commit dc8f68e24d48dad526f86305dfab75cbc5564b6f
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Aug 4 16:55:34 2011 +0530

    Deepak/Vinkesh | wrapped all messages under gettext for internationalization

 melange/common/auth.py                 |   15 +++---
 melange/common/client.py               |    6 ++-
 melange/common/config.py               |   59 ++++++++++----------
 melange/common/exception.py            |    7 ++-
 melange/common/extensions.py           |    6 +-
 melange/common/wsgi.py                 |    5 +-
 melange/ipam/models.py                 |   91 +++++++++++++++++---------------
 melange/tests/unit/test_ipam_models.py |    2 +-
 8 files changed, 103 insertions(+), 88 deletions(-)

commit 2a204a09c355f26a2177fd332910f477a33c76c8
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Aug 4 14:52:50 2011 +0530

    pep8 fixes

 bin/melange-manage              |   13 +++++++++----
 melange/tests/unit/test_auth.py |    7 ++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

commit 837fb099d19a6253f8e0be2891d313d45ac82df6
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Aug 4 14:18:55 2011 +0530

    Rajaram/Santhosh| missed a file :-)

 melange/tests/unit/mock_generator.py |   28 ++++++++++++++++++++++++++++
 melange/tests/unit/test_auth.py      |    1 +
 2 files changed, 29 insertions(+), 0 deletions(-)

commit ea291652daf63213e97211ea126d65945bf85980
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Aug 4 13:18:37 2011 +0530

    Rajaram/Santhosh | Fixed Ipv6 address allocation from networks controller that uses the given mac address

 melange/ipam/service.py                  |    9 ++++---
 melange/tests/__init__.py                |    8 ++++++
 melange/tests/functional/__init__.py     |    1 +
 melange/tests/functional/test_service.py |    2 +-
 melange/tests/unit/test_auth.py          |   39 ++++++++++-------------------
 melange/tests/unit/test_ipam_models.py   |   17 ++----------
 melange/tests/unit/test_ipam_service.py  |   36 +++++++++++++++++----------
 melange/tests/unit/test_wsgi.py          |    1 +
 8 files changed, 55 insertions(+), 58 deletions(-)

commit 9f0ca0de452c49c3ae0d317928f4eb7c70812457
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Thu Aug 4 13:05:54 2011 +0530

    Vinkesh/Deepak | Added test for keystone client

 bin/melange-manage              |   25 +-----------------
 melange/common/auth.py          |   25 +++++++++++++++++++
 melange/tests/unit/test_auth.py |   51 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 23 deletions(-)

commit d6e82e5b3834a4e608f6c7d2b5e381d77f4eba70
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Aug 3 19:01:41 2011 +0530

    Deepak/Santhosh | Added Keystone auth to CLI

 bin/melange-manage                       |   59 ++++++++++++++++++++++--------
 etc/melange/melange.conf.sample          |    2 +-
 melange/tests/functional/test_cli.py     |    2 +-
 melange/tests/functional/test_service.py |   21 -----------
 4 files changed, 45 insertions(+), 39 deletions(-)

commit 9b77acbde01c326ce44aff6113c0bf116db0fa78
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Aug 3 16:11:00 2011 +0530

    Deepak/Santhosh | Fixed RoleBasedAuth to not ignore the environ from the request

 melange/common/auth.py                   |   10 ++--
 melange/tests/functional/test_service.py |    2 +-
 melange/tests/unit/test_auth.py          |   75 ++++++++++++++++--------------
 3 files changed, 46 insertions(+), 41 deletions(-)

commit 0eab41234d618641a5355e26b833549d42135f0a
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Aug 3 14:48:46 2011 +0530

    Santhosh/Deepak | Refactored auth to consider multiple roles and cleaned up tests

 melange/common/auth.py          |   59 ++++++++-------
 melange/ipam/service.py         |   26 +------
 melange/tests/unit/test_auth.py |  158 +++++++++++++++++----------------------
 3 files changed, 104 insertions(+), 139 deletions(-)

commit 487ffb09eae9a758585be4e7137acd5d8400f4fe
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Tue Aug 2 18:45:52 2011 +0530

    Santhosh/Deepak | Added keystone config for tokenauth and refactored auth middleware

 etc/melange/melange.conf.sample         |   17 +++++++++++++-
 melange/common/auth.py                  |   28 +++++++----------------
 melange/tests/__init__.py               |    5 ++++
 melange/tests/unit/test_auth.py         |   36 +++++++++++++-----------------
 melange/tests/unit/test_ipam_service.py |    5 ----
 5 files changed, 45 insertions(+), 46 deletions(-)

commit 00a0161496f0577f6fb37dc0b5329802d62ad220
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Tue Aug 2 11:42:57 2011 +0530

    Santosh/Deepak | Changed the db api implementation to module

 etc/melange/melange.conf.sample           |    2 +-
 etc/melange/melange.conf.test             |    2 +-
 melange/db/__init__.py                    |    8 +-
 melange/db/api.py                         |  111 -----------
 melange/db/sqlalchemy/api.py              |  300 ++++++++++++++---------------
 melange/tests/unit/test_sqlalchemy_api.py |    2 +-
 6 files changed, 153 insertions(+), 272 deletions(-)

commit 8db3c4331e081ab1eb79d68d53e1cff7a4bf6c14
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Tue Aug 2 11:06:24 2011 +0530

    Santhosh/Deepak | Added tests for db api soft deletion

 melange/tests/unit/test_sqlalchemy_api.py |   47 +++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

commit be0aeac30f2b419bd1cc03a017faa58e29078b1e
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Mon Aug 1 19:20:19 2011 +0530

    Santhosh/Vinkesh | Removed usage of session and migration from code. Moved session and migration to db_api

 bin/melange                                  |    8 +--
 etc/melange/melange.conf.sample              |    3 +
 etc/melange/melange.conf.test                |    3 +
 melange/db/__init__.py                       |   13 +++--
 melange/db/api.py                            |   51 +++++++++++++-------
 melange/db/sqlalchemy/api.py                 |   67 ++++++++++++++++----------
 melange/db/sqlalchemy/migrate_repo/schema.py |    3 +-
 melange/db/sqlalchemy/session.py             |    2 +-
 melange/ipam/models.py                       |    2 +-
 melange/tests/__init__.py                    |    4 +-
 melange/tests/functional/__init__.py         |    4 +-
 melange/tests/unit/__init__.py               |    9 ++--
 melange/tests/unit/test_ipam_models.py       |    5 +--
 13 files changed, 106 insertions(+), 68 deletions(-)

commit 402c7215d7143792d5f63971d1f4667c02686b81
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Mon Aug 1 18:03:40 2011 +0530

    Santhosh/Vinkesh | Made db_api layer pluggable. Moved all code related to sqlalchemy to a new folder

 bin/melange                                        |    4 +-
 melange/common/pagination.py                       |    3 -
 melange/db/__init__.py                             |    7 +
 melange/db/api.py                                  |  247 ++++++-------------
 melange/db/mappers.py                              |   56 -----
 melange/db/migrate_repo/README                     |    4 -
 melange/db/migrate_repo/__init__.py                |   18 --
 melange/db/migrate_repo/manage.py                  |   19 --
 melange/db/migrate_repo/migrate.cfg                |   20 --
 melange/db/migrate_repo/schema.py                  |  108 ---------
 .../versions/001_add_ip_blocks_table.py            |   46 ----
 .../versions/002_add_ip_addresses_table.py         |   52 ----
 .../versions/003_add_type_to_ip_blocks.py          |   34 ---
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   54 -----
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |   37 ---
 .../006_add_deallocated_to_ip_addresses.py         |   34 ---
 .../migrate_repo/versions/007_add_policy_table.py  |   49 ----
 .../versions/008_add_ip_ranges_table.py            |   54 -----
 .../versions/009_add_policy_id_to_ip_blocks.py     |   39 ---
 .../versions/010_add_ip_octets_table.py            |   53 -----
 .../versions/011_add_tenant_id_to_ip_blocks.py     |   33 ---
 .../versions/012_add_tenant_id_to_policies.py      |   32 ---
 .../versions/013_add_parent_id_to_ip_blocks.py     |   33 ---
 .../versions/014_add_is_full_to_ip_blocks.py       |   37 ---
 ..._gateway_and_broadcast_addresses_to_ip_block.py |   40 ----
 .../016_add_deallocated_at_to_ip_addresses.py      |   34 ---
 ...broadcast_address_and_rename_gateway_address.py |   37 ---
 melange/db/migrate_repo/versions/__init__.py       |   18 --
 melange/db/migration.py                            |  125 ----------
 melange/db/session.py                              |  108 ---------
 melange/db/sqlalchemy/__init__.py                  |   16 ++
 melange/db/sqlalchemy/api.py                       |  194 +++++++++++++++
 melange/db/sqlalchemy/mappers.py                   |   56 +++++
 melange/db/sqlalchemy/migrate_repo/README          |    4 +
 melange/db/sqlalchemy/migrate_repo/__init__.py     |   18 ++
 melange/db/sqlalchemy/migrate_repo/manage.py       |   19 ++
 melange/db/sqlalchemy/migrate_repo/migrate.cfg     |   20 ++
 melange/db/sqlalchemy/migrate_repo/schema.py       |  108 +++++++++
 .../versions/001_add_ip_blocks_table.py            |   46 ++++
 .../versions/002_add_ip_addresses_table.py         |   52 ++++
 .../versions/003_add_type_to_ip_blocks.py          |   34 +++
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   54 +++++
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |   37 +++
 .../006_add_deallocated_to_ip_addresses.py         |   34 +++
 .../migrate_repo/versions/007_add_policy_table.py  |   49 ++++
 .../versions/008_add_ip_ranges_table.py            |   54 +++++
 .../versions/009_add_policy_id_to_ip_blocks.py     |   39 +++
 .../versions/010_add_ip_octets_table.py            |   53 +++++
 .../versions/011_add_tenant_id_to_ip_blocks.py     |   33 +++
 .../versions/012_add_tenant_id_to_policies.py      |   32 +++
 .../versions/013_add_parent_id_to_ip_blocks.py     |   33 +++
 .../versions/014_add_is_full_to_ip_blocks.py       |   37 +++
 ..._gateway_and_broadcast_addresses_to_ip_block.py |   40 ++++
 .../016_add_deallocated_at_to_ip_addresses.py      |   34 +++
 ...broadcast_address_and_rename_gateway_address.py |   37 +++
 .../sqlalchemy/migrate_repo/versions/__init__.py   |   18 ++
 melange/db/sqlalchemy/migration.py                 |  125 ++++++++++
 melange/db/sqlalchemy/session.py                   |  108 +++++++++
 melange/ipam/models.py                             |    2 +-
 melange/tests/__init__.py                          |    2 +-
 melange/tests/functional/__init__.py               |    2 +-
 melange/tests/unit/__init__.py                     |    4 +-
 melange/tests/unit/test_ipam_models.py             |    2 +-
 63 files changed, 1477 insertions(+), 1354 deletions(-)

commit 96cb2dd05fe7c98bc502a9a31bf84783f2655162
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Mon Aug 1 11:12:00 2011 +0530

    Santhosh/Vinkesh | Added pagination for ip_ranges, ip_octets and policies

 melange/ipam/service.py                 |   15 +++-----
 melange/tests/unit/test_ipam_models.py  |    2 +-
 melange/tests/unit/test_ipam_service.py |   56 +++++++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 17 deletions(-)

commit 638e1c7c9349aeb3d30a9fb2d641720158095a96
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Jul 29 16:24:02 2011 +0530

    Rajaram & Vinkesh | Refactored pagination code. Added pagination for IpAddress#index

 melange/common/pagination.py          |   27 +++++++++++++++++-----
 melange/ipam/service.py               |   33 +++++---------------------
 melange/tests/unit/test_pagination.py |   40 ++++++++++++++++++++++++++++++++-
 3 files changed, 67 insertions(+), 33 deletions(-)

commit 8f6f0941de42768727c9d272c53755a5bdac1f9f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Jul 29 15:53:19 2011 +0530

    Deepak/Santhosh | Removed the broadcast_address column and renamed gateway_address to gateway, Added netmask

 ..._gateway_and_broadcast_addresses_to_ip_block.py |    5 +-
 ...broadcast_address_and_rename_gateway_address.py |   37 +++++++++++++++
 melange/ipam/models.py                             |   18 ++++++-
 melange/tests/unit/test_ipam_models.py             |   48 +++++++++++++-------
 melange/tests/unit/test_ipam_service.py            |   42 +++++++++---------
 5 files changed, 107 insertions(+), 43 deletions(-)

commit 78f85fb42fe18cb80cf12f144cf7ae9caae1a9a4
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Jul 29 10:32:29 2011 +0530

    Rajaram/Vinkesh | Moved paginated data ojects to seperate module. Removed some unused methods from utils module

 melange/common/pagination.py            |   97 +++++++++++++++++++++++++++++++
 melange/common/utils.py                 |   58 ------------------
 melange/ipam/service.py                 |   77 +------------------------
 melange/tests/unit/test_ipam_service.py |   17 +-----
 melange/tests/unit/test_pagination.py   |   33 +++++++++++
 5 files changed, 132 insertions(+), 150 deletions(-)

commit 52228943615b89527122c760cc3c2fe90aed42b0
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Jul 28 19:18:13 2011 +0530

    Rajaram / Vinkesh | Added paginated data to have links as atom element as per the spec

 melange/common/wsgi.py                  |    9 ++-
 melange/ipam/service.py                 |  110 +++++++++++++++++++++++--------
 melange/tests/unit/test_ipam_service.py |   36 ++++++++++-
 3 files changed, 123 insertions(+), 32 deletions(-)

commit c2fe3a08647ccb61ffc3583e12948f779562775f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 28 14:59:30 2011 +0530

    Changed the melange service default port to 9898

 bin/melange                     |    2 +-
 bin/melange-manage              |    4 ++--
 etc/melange/melange.conf.sample |    2 +-
 etc/melange/melange.conf.test   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

commit 5c7386828155028011c91aea35ab135049222af9
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Jul 28 14:29:34 2011 +0530

    Rajaram/Vinkesh | Refactored serialization of results returned from controller action

 melange/common/wsgi.py  |   27 +++++++++++++++-------
 melange/ipam/service.py |   54 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 62 insertions(+), 19 deletions(-)

commit ce19bc6a9b060c2b8bc1ec839b6ae42e7717063e
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 28 11:50:11 2011 +0530

    Deepak/Santhosh | Handled the response type based on the versioned mime type in accept headers

 melange/common/wsgi.py                   |   10 +++++++---
 melange/tests/functional/__init__.py     |    5 ++---
 melange/tests/functional/test_service.py |    1 +
 melange/tests/unit/test_wsgi.py          |   15 ++++++++++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

commit 6e08cbb4205704368160c6e7df4fd6d1c1bd1882
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 28 10:55:04 2011 +0530

    Santhosh/Deepak | Handling mime type versioning for non existing version, making sure url precedes mime type version

 melange/common/wsgi.py                   |   45 +++++++++++-----
 melange/tests/functional/__init__.py     |    8 +++
 melange/tests/functional/test_service.py |   27 ++++++----
 melange/tests/unit/test_wsgi.py          |   87 ++++++++++++++++++++++++++----
 4 files changed, 134 insertions(+), 33 deletions(-)

commit f257c1bf5f2f1e01a79d00bc98c308a31c85ec90
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Jul 28 10:29:51 2011 +0530

    Vinkesh/Rajaram|Added a README with instructions on running Melange app and tests

 melange/README |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

commit a01c0399eb20ac7d7b5545455be9ac8ff4152b47
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 27 16:18:29 2011 +0530

    Vinkesh/Santhosh | Added the pagination response for IpAddresses Controller

 melange/ipam/service.py                 |    8 +++-----
 melange/tests/unit/test_ipam_service.py |    6 ++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

commit cc168d27025d723af66b673dcc0bda23257c0c0a
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 27 15:26:43 2011 +0530

    Vinkesh/Santhosh | Modified the paginated response to provide the links only when next_marker exists

 melange/common/utils.py                 |    7 +++++++
 melange/ipam/service.py                 |   26 +++++++++++++++-----------
 melange/tests/unit/test_ipam_service.py |    2 +-
 melange/tests/unit/test_utils.py        |   11 +++++++++++
 4 files changed, 34 insertions(+), 12 deletions(-)

commit 1a7679ee387ef144dc258cfdc9d9af944c378af0
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 27 15:21:14 2011 +0530

    Rajaram/Deepak | Added custom urlmap for versioning resources via Accept header

 etc/melange/melange.conf.sample          |    2 +-
 melange/common/wsgi.py                   |   26 +++++++++++++
 melange/tests/functional/__init__.py     |    5 ++-
 melange/tests/functional/test_service.py |    9 ++++
 melange/tests/unit/test_wsgi.py          |   60 ++++++++++++++++++++++++++++++
 5 files changed, 100 insertions(+), 2 deletions(-)

commit 135ac350e0e729d1bd30745afbe397bb6f3fb6f7
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 27 11:29:00 2011 +0530

    Vinkesh/Santhosh | Added pagination to IpBlockController which will provide the next link

 melange/db/api.py                       |    2 +-
 melange/ipam/models.py                  |    6 ++++++
 melange/ipam/service.py                 |   25 +++++++++++++++++--------
 melange/tests/__init__.py               |    6 ++++++
 melange/tests/unit/test_ipam_service.py |   27 +++++++++++++++++++++++++--
 5 files changed, 55 insertions(+), 11 deletions(-)

commit 3335c0f9d1d53af8d5f41bb0e6b1f320a31e3028
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 26 16:10:04 2011 +0530

    Deepak/Vinkesh | added logging options to delete deallocated ips script

 bin/melange-delete-deallocated-ips |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

commit 5e54bb607ef2bd5ff61d810777d842fb048a6b7f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 26 11:03:56 2011 +0530

    Deepak/Vinkesh | removed scheduling logic from melange's  delete all deallocated ips script

 bin/melange-delete-deallocated-ips |   40 +++++++++++++++++++++++++++
 bin/melange-scheduler              |   52 ------------------------------------
 2 files changed, 40 insertions(+), 52 deletions(-)

commit 283ba90aa5264215de0e75002870c44285cc0a94
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 26 10:00:23 2011 +0530

    Vinkesh/deepak | Added a scheduler to delete deallocated ips

 bin/melange-scheduler |   52 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

commit ab7859683f1426d45e01ea26c24dc287798e2c1d
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Jul 22 11:27:26 2011 +0530

    pep8 Fixes

 melange/db/api.py      |    2 +-
 melange/ipam/models.py |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

commit c201c049319f49a8c961d7fba47bf20c3df73fc0
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Jul 22 11:23:49 2011 +0530

    Deepak/Santhosh | Added unit level test for Query and added delete method to query

 melange/ipam/models.py                 |   26 +++++-----
 melange/tests/unit/test_ipam_models.py |   84 ++++++++++++++++++++++----------
 2 files changed, 72 insertions(+), 38 deletions(-)

commit 592343dc4a3669e0c585e17505fd4e006e5d1332
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Jul 22 10:51:37 2011 +0530

    Santosh/Deepak | Moved limits method from model to query object

 melange/db/api.py                      |   75 +++++++++++++++++---------------
 melange/ipam/models.py                 |   11 +++--
 melange/ipam/service.py                |   24 +++++------
 melange/tests/unit/test_ipam_models.py |    9 ++--
 4 files changed, 61 insertions(+), 58 deletions(-)

commit 21ab1aa574266ce532f8a954ef91f59ef104951b
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Fri Jul 22 10:20:00 2011 +0530

    Deepak/Santhosh | Removed the usage of sqlalchemy query objects outside the db api layer.

 melange/db/api.py                       |   34 +++++++++++++++++++++----------
 melange/ipam/models.py                  |   31 +++++++++++++++++++++------
 melange/ipam/service.py                 |    8 +++---
 melange/tests/unit/test_ipam_models.py  |    8 +++---
 melange/tests/unit/test_ipam_service.py |    8 +++---
 5 files changed, 59 insertions(+), 30 deletions(-)

commit e53e0c73ec55418c50f178c22fc1faa91246d7bd
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 20 19:35:43 2011 +0530

    rajram/deepak | Changed the port to 9696 and changed conf path to etc/melange/

 etc/melange.conf.sample              |   60 ---------------------------------
 etc/melange.conf.test                |   61 ----------------------------------
 etc/melange/melange.conf.sample      |   60 +++++++++++++++++++++++++++++++++
 etc/melange/melange.conf.test        |   59 ++++++++++++++++++++++++++++++++
 melange/__init__.py                  |    2 +-
 melange/common/client.py             |    2 +-
 melange/common/config.py             |   24 +++++++-------
 melange/tests/functional/__init__.py |    6 ++--
 melange/tests/functional/server.py   |   46 +++++++++++++-------------
 9 files changed, 159 insertions(+), 161 deletions(-)

commit c253218f466314e6f4a0958b8ae0cc37e9223c4f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 20 18:06:51 2011 +0530

    Updated authors list

 Authors |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit bf6a591b27ca00d7cf36ae31ef418fb23632a340
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 20 12:33:04 2011 +0530

    Rajaram/Deepak | Changed public block cidr validation to check doen't overlap with other root level blocks

 melange/ipam/models.py                 |   17 ++++++++++-------
 melange/tests/unit/test_ipam_models.py |   21 +++++----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

commit a5ec5ca3bac2876bc775f410a877b7d55eea6992
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 20 11:51:37 2011 +0530

    Rajaram/Deepak | Refactored ip block validations to avoid redundant validations

 melange/ipam/models.py                 |   40 +++++++++++++++++++++----------
 melange/tests/unit/test_ipam_models.py |   14 ++++++----
 2 files changed, 35 insertions(+), 19 deletions(-)

commit 7bc9800a5d65ae558dfd338008941390cb041237
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 20 11:09:09 2011 +0530

    Rajaram/Deepak | Refactored sql, convert IN query to JOIN

 melange/db/api.py                      |   17 ++++++++++-------
 melange/tests/unit/test_ipam_models.py |    1 -
 2 files changed, 10 insertions(+), 8 deletions(-)

commit ad3d1782352e0f7ff28f7c6cbd0bbf3cea5c0ae1
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 18:06:15 2011 +0530

    Deepak/Vinkesh | Validating cidr does not overlap with other top level blocks in that network

 melange/db/api.py                      |   17 +++++++++-
 melange/ipam/models.py                 |   19 ++++++++++-
 melange/tests/functional/test_cli.py   |    5 +--
 melange/tests/unit/test_ipam_models.py |   52 ++++++++++++++++++++++++++++++--
 4 files changed, 83 insertions(+), 10 deletions(-)

commit 2082ae7921e22f3f8d0f87203f3337ff64c91c59
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 19 15:59:00 2011 +0530

    Rajaram/Santhosh | Added RFC2462 IpV6 generator and renamed the default_generator to tenant_based_generator

 melange/ipam/models.py                             |    3 +-
 melange/ipv6/default_generator.py                  |   45 -----------------
 melange/ipv6/rfc2462_generator.py                  |   40 +++++++++++++++
 melange/ipv6/tenant_based_generator.py             |   45 +++++++++++++++++
 melange/tests/unit/test_ipam_models.py             |    4 +-
 melange/tests/unit/test_ipv6_default_generator.py  |   53 --------------------
 melange/tests/unit/test_rfc2462_ipv6_generator.py  |   51 +++++++++++++++++++
 .../tests/unit/test_tenant_based_ipv6_generator.py |   51 +++++++++++++++++++
 8 files changed, 191 insertions(+), 101 deletions(-)

commit 8245039bfec26fa10d53a31cf788cffb29151dbb
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 15:09:12 2011 +0530

    Deepak/Vinkesh | Validating subnets cidr does not overlap with its siblings

 melange/ipam/models.py                 |   18 ++++++++++++++
 melange/tests/unit/test_ipam_models.py |   41 ++++++++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 5 deletions(-)

commit 0d49fe76f26bace5e63ca819ddd64487d66ea6cb
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 14:15:44 2011 +0530

    Vinkesh/Deepak | Validate non leaf block cannot allocate ips

 melange/ipam/models.py                 |   19 +++++++++++++++++--
 melange/tests/unit/test_ipam_models.py |   22 ++++++++++++++--------
 2 files changed, 31 insertions(+), 10 deletions(-)

commit 749f920fd78aa29b407f9c60ff516aabee202b6f
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 19 12:13:59 2011 +0530

    Rajaram/Santhosh | Deallocated Ips are deleted after a configurable number of days

 melange/db/api.py                                  |    6 ++
 .../016_add_deallocated_at_to_ip_addresses.py      |   34 ++++++++++
 melange/ipam/models.py                             |   14 +++-
 melange/tests/unit/test_ipam_models.py             |   69 +++++++++++++++-----
 4 files changed, 103 insertions(+), 20 deletions(-)

commit fac27cc49886d0b48182497740c6a551fb02a2c0
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Jul 15 16:37:01 2011 +0530

    Vinkesh/Santhosh | Added nameserver as a placeholder for storing dns_info for a data center. It is returned by ip_allocations exposed for networks

 etc/melange.conf.sample                |    6 ++++++
 etc/melange.conf.test                  |    6 ++++++
 melange/ipam/models.py                 |    3 ++-
 melange/tests/unit/test_ipam_models.py |    5 ++++-
 4 files changed, 18 insertions(+), 2 deletions(-)

commit fb089c17ffb065f8f1f206fa77d85945eae34fec
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Jul 15 16:01:41 2011 +0530

    Vinkesh/Santhosh | Added gateway & broadcast address to IpBlock. Exposed netework ip_allocations will return the broadcast & gateway address along with it

 ..._gateway_and_broadcast_addresses_to_ip_block.py |   39 ++++++++++++++++++++
 melange/ipam/models.py                             |    6 +++
 melange/ipam/service.py                            |    3 +-
 melange/tests/functional/test_cli.py               |    5 ++-
 melange/tests/unit/test_ipam_models.py             |   10 +++++
 melange/tests/unit/test_ipam_service.py            |   21 +++++++----
 6 files changed, 73 insertions(+), 11 deletions(-)

commit 7ace1a6c9d2d9f536a983333899e4105dfcc9cd6
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Jul 15 13:03:25 2011 +0530

    Vinkesh/Santhosh | Added CLI for subnets to create and list them

 bin/melange-manage                   |   17 ++++++++++
 melange/tests/functional/test_cli.py |   54 +++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletions(-)

commit f73ea5e8e73a6798ff239d52b0163f62f7c46913
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Jul 15 11:57:58 2011 +0530

    Vinkesh/Santhosh | Modified the subnets, IpAddresses & IpBlocks to remove the separation of public & private in the routes

 bin/melange-manage                       |   10 +-
 melange/ipam/service.py                  |   62 +++----
 melange/tests/functional/test_cli.py     |   78 ++------
 melange/tests/functional/test_service.py |    8 +-
 melange/tests/unit/test_ipam_models.py   |    4 +-
 melange/tests/unit/test_ipam_service.py  |  298 ++++++++++++------------------
 6 files changed, 168 insertions(+), 292 deletions(-)

commit fd5d0a7303fccad099d1a77ca4b5b2684b302204
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Thu Jul 14 12:54:32 2011 +0530

    Santhosh/Vinkesh | Added a validation for the presence of type for IpBlocks.

 melange/ipam/models.py                 |   16 +++++---
 melange/tests/factories/models.py      |    2 +
 melange/tests/unit/test_ipam_models.py |   57 ++++++++++++++++++--------------
 3 files changed, 44 insertions(+), 31 deletions(-)

commit e62f4712ea8bb7cd01c66c50b8d2a3e927ead2b8
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Jul 13 19:45:11 2011 +0530

    Vinkesh/Rajaram|added ip_allocations API that gives both v4 and v6 addresses for a port on a network

 melange/common/utils.py                 |    5 --
 melange/ipam/models.py                  |   42 ++++++++++-----
 melange/ipam/service.py                 |   28 +++++-----
 melange/tests/unit/test_ipam_models.py  |   62 +++++++++++-----------
 melange/tests/unit/test_ipam_service.py |   85 +++++++++---------------------
 5 files changed, 99 insertions(+), 123 deletions(-)

commit 0e640ee0e82aa6c94ee33e660a7763589c14c1b9
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 13 15:58:03 2011 +0530

    Santhosh/Deepak | Added ability to create subnet for given tenant

 melange/ipam/models.py                  |   13 +++++-
 melange/ipam/service.py                 |    2 +-
 melange/tests/unit/test_ipam_models.py  |   64 +++++++++++++++++++++---------
 melange/tests/unit/test_ipam_service.py |   43 +++++++++++++++++++-
 4 files changed, 97 insertions(+), 25 deletions(-)

commit e9388c02e22f2527ba081a4fd3eea1402459080b
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 13 15:11:01 2011 +0530

    Deepak/Santhosh | Moved the Api to create subnets to SubnetController. Added cascade delete for subnets.

 melange/ipam/models.py                  |   16 +++++++----
 melange/ipam/service.py                 |   19 +++++++++----
 melange/tests/unit/test_ipam_models.py  |   46 +++++++++++++++++++++++++++++-
 melange/tests/unit/test_ipam_service.py |   34 +++++++++++++++++++++--
 4 files changed, 98 insertions(+), 17 deletions(-)

commit e889a1e91dbed918d5bf581adfc885eb454b8ca1
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Jul 13 11:57:09 2011 +0530

    Vinkesh/Rajaram|used is_full flag to optimize ip block allocations through networks

 .../versions/014_add_is_full_to_ip_blocks.py       |    2 +-
 melange/ipam/models.py                             |    3 +++
 melange/tests/unit/test_ipam_models.py             |   17 +++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

commit 607dbab869f536c75448f57624f3e9297dee0a72
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 13 11:22:16 2011 +0530

    Deepak/Santhosh | Added an API to find the subnets of a block

 melange/ipam/service.py                 |   54 ++++++++++++++++++++++++-------
 melange/tests/unit/test_ipam_service.py |   43 ++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 12 deletions(-)

commit ded2e73a72ca20b64c9ea9aa21f158d4b33bfc06
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 12 16:31:23 2011 +0530

    Rajaram/Santhosh | Added is_full column on ip_block to find whether the block is full

 melange/db/api.py                                  |   10 +++
 .../versions/014_add_is_full_to_ip_blocks.py       |   37 +++++++++++
 melange/ipam/models.py                             |   19 ++++--
 melange/tests/unit/test_ipam_models.py             |   65 ++++++++++++++++----
 4 files changed, 111 insertions(+), 20 deletions(-)

commit 2e5019f23dc4f0476915fce7183755e931378e26
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Tue Jul 12 12:21:25 2011 +0530

    Deepak/Vinkesh | subnet can have network even if its supernet doesnt

 melange/ipam/models.py                 |    3 ++-
 melange/tests/unit/test_ipam_models.py |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

commit dc907525c6c37e5251f310a9f257c2a202600446
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 19:35:45 2011 +0530

    Deepak/Vinkesh | Added a validation to check whether subnet has same network_id as supernet

 melange/ipam/models.py                  |    9 +++-
 melange/ipam/service.py                 |    2 +-
 melange/tests/functional/test_cli.py    |    7 +-
 melange/tests/unit/test_ipam_models.py  |   15 ++++-
 melange/tests/unit/test_ipam_service.py |   98 ++++++++++++++++---------------
 5 files changed, 75 insertions(+), 56 deletions(-)

commit 6fe09de9573055604ee1e36e877ddf3a19503e83
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 18:15:13 2011 +0530

    Vinkesh/Deepak | Updated CLI to create block with parent_id

 bin/melange-manage                   |    4 ++--
 melange/tests/functional/test_cli.py |   13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

commit e5254ae4830bd6c56539723f04fb212b44b2bb5a
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 17:36:19 2011 +0530

    Deepak/Vinkesh | Added validations for cidr w.r.t parent block cidr, saving lowest address of cidr

 melange/ipam/models.py                  |   35 +++++--
 melange/tests/factories/models.py       |    4 +-
 melange/tests/unit/test_ipam_models.py  |  175 +++++++++++++++++++++++--------
 melange/tests/unit/test_ipam_service.py |   18 ++--
 4 files changed, 166 insertions(+), 66 deletions(-)

commit 004985ca47aa432a43fcdcc0c3d17c22f85f0eb6
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Mon Jul 11 16:38:35 2011 +0530

    Vinkesh | Moved tests folder to melange subfolder

 etc/melange.conf.test                             |    2 +-
 melange/__init__.py                               |   13 +
 melange/tests/__init__.py                         |   54 +
 melange/tests/factories/__init__.py               |   16 +
 melange/tests/factories/models.py                 |   64 +
 melange/tests/functional/__init__.py              |  102 ++
 melange/tests/functional/server.py                |   77 ++
 melange/tests/functional/test_cli.py              |  400 ++++++
 melange/tests/functional/test_service.py          |   66 +
 melange/tests/unit/__init__.py                    |  125 ++
 melange/tests/unit/extensions/__init__.py         |   15 +
 melange/tests/unit/extensions/foxinsocks.py       |   97 ++
 melange/tests/unit/test_auth.py                   |  202 +++
 melange/tests/unit/test_config.py                 |   48 +
 melange/tests/unit/test_data_types.py             |   39 +
 melange/tests/unit/test_extensions.py             |  227 ++++
 melange/tests/unit/test_ipam_models.py            |  968 ++++++++++++++
 melange/tests/unit/test_ipam_service.py           | 1458 +++++++++++++++++++++
 melange/tests/unit/test_ipv6_default_generator.py |   53 +
 melange/tests/unit/test_utils.py                  |  183 +++
 melange/tests/unit/test_versions.py               |   35 +
 melange/tests/unit/test_wsgi.py                   |  184 +++
 tests/__init__.py                                 |   54 -
 tests/factories/__init__.py                       |   16 -
 tests/factories/models.py                         |   64 -
 tests/functional/__init__.py                      |  101 --
 tests/functional/server.py                        |   77 --
 tests/functional/test_cli.py                      |  398 ------
 tests/functional/test_service.py                  |   66 -
 tests/unit/__init__.py                            |  124 --
 tests/unit/extensions/__init__.py                 |   15 -
 tests/unit/extensions/foxinsocks.py               |   97 --
 tests/unit/test_auth.py                           |  202 ---
 tests/unit/test_config.py                         |   48 -
 tests/unit/test_data_types.py                     |   39 -
 tests/unit/test_extensions.py                     |  227 ----
 tests/unit/test_ipam_models.py                    | 1024 ---------------
 tests/unit/test_ipam_service.py                   | 1457 --------------------
 tests/unit/test_ipv6_default_generator.py         |   53 -
 tests/unit/test_utils.py                          |  183 ---
 tests/unit/test_versions.py                       |   35 -
 tests/unit/test_wsgi.py                           |  184 ---
 42 files changed, 4427 insertions(+), 4465 deletions(-)

commit d14618b2a3fdf0108cf35877acb8cbafc26eec44
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 15:40:49 2011 +0530

    Tracking parent block of a subnet

 .../versions/013_add_parent_id_to_ip_blocks.py     |   33 ++++++++++++++++++++
 melange/ipam/models.py                             |   22 ++++++++++---
 tests/unit/test_ipam_models.py                     |   29 +++++++++++++++++-
 3 files changed, 78 insertions(+), 6 deletions(-)

commit d1d8cf5b6a7e2fa3af67e8f3b0e05bbc81b917a2
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 12:55:51 2011 +0530

    Added validation to check block type should be same within a network

 melange/ipam/models.py         |    6 ++++++
 tests/unit/test_ipam_models.py |   10 ++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

commit 03233d3f777d326a3e084d40f435637edd856bd0
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 11 11:07:38 2011 +0530

    Rajaram/Deepak | Including created_at and updated_at fields in api response

 melange/ipam/models.py          |   47 ++++++++++-----------
 tests/factories/models.py       |   18 ++++----
 tests/unit/__init__.py          |    7 +++-
 tests/unit/test_ipam_models.py  |   65 ++++++++++++++++++++---------
 tests/unit/test_ipam_service.py |   87 +++++++++++++++++++--------------------
 5 files changed, 125 insertions(+), 99 deletions(-)

commit d22c5a3b4b1968a4a4b6371208aed0d4e033b236
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 18:41:08 2011 +0530

    Vinkesh/Deepak | Model will take care of setting timstamps on create or update, ignores the input value for auto generated columns

 melange/common/utils.py        |    4 ++++
 melange/ipam/models.py         |   12 +++++++++---
 tests/unit/__init__.py         |   15 ++++++++++++++-
 tests/unit/test_ipam_models.py |   39 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 65 insertions(+), 5 deletions(-)

commit abad6ea95019cdb64fd1c8ba9624a9c709ef5586
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 16:22:52 2011 +0530

    Vinkesh/Deepak | Added CLI for ip block update

 bin/melange-manage              |    3 +++
 melange/ipam/models.py          |    2 +-
 melange/ipam/service.py         |   11 +++++++----
 tests/functional/test_cli.py    |   36 ++++++++++++++++++++++++++++++++++++
 tests/unit/test_ipam_models.py  |    4 +++-
 tests/unit/test_ipam_service.py |    9 +++++++++
 6 files changed, 59 insertions(+), 6 deletions(-)

commit e9e500118f6c8def665ab780d82f9d93dcd6ad88
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 15:40:34 2011 +0530

    Vinkesh/Deepak | Exclude cidr tenant_id and type while updating ip_block

 melange/ipam/service.py         |    2 +-
 tests/unit/test_ipam_service.py |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

commit b4d0cf7a09ad9de9cfc9ed0d9dc0ecdc61757a3f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 15:29:25 2011 +0530

    Vinkesh/Deepak | Added ip block update api, changed update to take kwargs

 melange/ipam/models.py          |   20 ++++++++++++--------
 melange/ipam/service.py         |   28 ++++++++++++++++------------
 tests/unit/test_ipam_models.py  |   17 +++++++++++++++++
 tests/unit/test_ipam_service.py |   16 ++++++++++++++++
 4 files changed, 61 insertions(+), 20 deletions(-)

commit 4484cb8edfd82915df3899d3d1b1a1e4ff51c265
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 12:57:32 2011 +0530

    Vinkesh/Deepak| Fixed scoping by type for ip addresses controller

 melange/ipam/service.py         |   20 ++++++++++++++------
 tests/unit/test_ipam_service.py |   16 ++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

commit 46937d18cccb1a2857277c536e5d2f90f68829c3
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 12:25:05 2011 +0530

    Vinkesh/Deepak | Fixed the routes used in ip address controller tests

 melange/ipam/service.py         |    4 +-
 tests/unit/test_ipam_service.py |  117 +++++++++++++++++---------------------
 2 files changed, 54 insertions(+), 67 deletions(-)

commit 9ac5b4ba8db0da8628c29c0155baf5b29de06ad8
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jul 7 11:02:38 2011 +0530

    Deepak/Banka | made IpV6 address allocation for given address and added validations around it

 melange/ipam/models.py          |   66 +++++++++++++++++++--------------------
 melange/ipam/service.py         |    5 +--
 tests/unit/test_ipam_models.py  |   20 ++++++++++++
 tests/unit/test_ipam_service.py |   32 +++++++++++++++++--
 4 files changed, 83 insertions(+), 40 deletions(-)

commit b1077d9010c95677abc9bcd808956e63c52cf30d
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jul 6 11:52:22 2011 +0530

    Santosh/Deepak | Handling error on missing params for ipv6 address generators

 melange/ipam/models.py            |   19 +++++++++++++++----
 melange/ipam/service.py           |    3 ++-
 melange/ipv6/default_generator.py |    8 +++++---
 tests/__init__.py                 |    8 ++++++++
 tests/unit/test_ipam_models.py    |   36 +++++++++++++++++++++++-------------
 tests/unit/test_ipam_service.py   |   11 +++++++++++
 6 files changed, 64 insertions(+), 21 deletions(-)

commit 30669ac3c905ced92b5fc54b4fe1d24931b383bf
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 5 18:41:49 2011 +0530

    Santhosh/Deepak | Verified the ipv6 address generation in subsequent calls

 melange/ipv6/default_generator.py         |   14 +++++++-------
 tests/unit/test_ipv6_default_generator.py |   19 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

commit aebf18aebf3ebccc8b203587bc2c0ce71a6ec4a7
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jul 5 18:15:49 2011 +0530

    Rajaram/Vinkesh | Added tests for TenantBased clients

 bin/melange-manage           |   92 +++++++++++++------------
 tests/functional/test_cli.py |  152 ++++++++++++++++++++++++++++--------------
 2 files changed, 148 insertions(+), 96 deletions(-)

commit d3d48ae4930a91fd5381589aa757cc868325cf3a
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 5 17:54:43 2011 +0530

    Santhosh/Deepak | Expanding ip address before save and find methods, added iterator for ipv6 address generator

 melange/ipam/models.py         |   53 ++++++++++++++++++++++++++++++++-------
 tests/unit/test_ipam_models.py |   31 ++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 12 deletions(-)

commit 308df1aaecadac7b17444de0a3d443f76b0175fb
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 5 15:52:55 2011 +0530

    Santosh/Deepak | Made ipv6 address generator not to depend on melange models, moved iteration logic to ip block model

 melange/ipam/models.py                    |   16 +++++---
 melange/ipv6/default_generator.py         |   37 +++++++-----------
 tests/unit/test_ipam_models.py            |   59 +++++++++++++++++++++--------
 tests/unit/test_ipv6_default_generator.py |   51 +++++++++++++------------
 4 files changed, 93 insertions(+), 70 deletions(-)

commit 274e0fef91b32f4be96db5b2b7fe892cfcabab2f
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jul 5 15:14:16 2011 +0530

    Rajaram/Vinkesh| Added CLI client for unusable_ip_octet

 bin/melange-manage           |   25 +++++++++++++++-
 tests/functional/test_cli.py |   66 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 3 deletions(-)

commit 9d9ce333cd3e29cff3074dc052a67cc3beb059fa
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jul 5 14:51:26 2011 +0530

    Rajaram/Vinkesh| Added CLI client for unusable_ip_range

 bin/melange-manage           |   26 +++++++++++++++-
 tests/functional/test_cli.py |   69 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 92 insertions(+), 3 deletions(-)

commit ff021a6417be492c22e345a98b07fcbc770dc0ad
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jul 5 11:41:31 2011 +0530

    Rajaram/Vinkesh | Fixed a bug in option parsing where whole options was not matched from among possible options rather substring

 bin/melange-manage |   46 ++++++++++++++++++++++++----------------------
 1 files changed, 24 insertions(+), 22 deletions(-)

commit f1b9da921ca75861e0b0a96ef55644a0883d79ff
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jul 4 19:18:12 2011 +0530

    Rajaram/Deepak|sqlalchemy logger is only configured duirng app start and not tests

 bin/melange           |    2 +-
 melange/db/session.py |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

commit c329b0b79eeed62eb6c6a72002630f5931e36f30
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Mon Jul 4 19:15:16 2011 +0530

    Santhosh/Vinkesh | Moved the IPV6 generator to melange/ipv6

 melange/ipam/models.py                    |   33 +------------------
 melange/ipv6/__init__.py                  |   16 +++++++++
 melange/ipv6/default_generator.py         |   52 +++++++++++++++++++++++++++++
 tests/unit/test_ipam_models.py            |   35 -------------------
 tests/unit/test_ipv6_default_generator.py |   51 ++++++++++++++++++++++++++++
 5 files changed, 120 insertions(+), 67 deletions(-)

commit 0383ee3c7799694fb1ef5973621ad892cd5a9148
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jul 4 18:55:20 2011 +0530

    Testing global commands in CLI does not set tenant_id

 bin/melange-manage           |    2 +-
 tests/functional/test_cli.py |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

commit 34b2c833e95ccdbdf608fe9e9910b21125f23ed3
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Mon Jul 4 18:47:20 2011 +0530

    Santhosh/Vinkesh | Modified the IpV6 allocation algo to handle the case when the address is already allocated.

 melange/ipam/models.py         |   16 +++++++++++++---
 tests/unit/test_ipam_models.py |   10 ++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

commit bb1e6bf59838d10999f6ed13a4c9e658998b578d
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jul 4 18:23:47 2011 +0530

    Added CLI for policy

 bin/melange-manage                    |   38 +++++++-
 melange/common/utils.py               |    5 +
 melange/ipam/models.py                |    2 +-
 tests/functional/test_cli.py          |  182 +++++++++++++++++++++++++++++++++
 tests/functional/test_ip_block_cli.py |  129 -----------------------
 tests/unit/test_ipam_models.py        |    6 +-
 tests/unit/test_utils.py              |    7 ++
 7 files changed, 234 insertions(+), 135 deletions(-)

commit 765036c7bc3ba1518a3f160844fc65b3baf10112
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Mon Jul 4 17:30:52 2011 +0530

    Santhosh/Vinkesh | Added the new default algo to allcoate IPV6 addresses.

 melange/ipam/models.py         |   23 +++++++++++++++++++----
 tests/unit/test_ipam_models.py |   37 ++++++++++++++++++++++++++++++-------
 2 files changed, 49 insertions(+), 11 deletions(-)

commit 1ce2b492ac55a2b525731ede6352dd42d4c035f4
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Mon Jul 4 12:14:29 2011 +0530

    Santhosh/Vinkesh | allocate_ip uses pluggable IpV6 generator

 etc/melange.conf.test          |    3 +-
 melange/ipam/models.py         |   36 ++++++++++++++++++----------
 tests/__init__.py              |    4 +++
 tests/factories/models.py      |    9 ++++++-
 tests/unit/test_ipam_models.py |   50 ++++++++++++++++++++-------------------
 5 files changed, 63 insertions(+), 39 deletions(-)

commit c0222d1bce59ff4b210127bedd79d3a9446a3862
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 19:13:11 2011 +0530

    Added missed files in last commit

 tests/factories/__init__.py |   16 +++++++++++
 tests/factories/models.py   |   59 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 0 deletions(-)

commit c10cde1cb84ac9a3c8f8ba71711471047fa2fe78
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 18:19:02 2011 +0530

    Santhosh/Deepak | Added the CLI tests for private and tenant based ip_blocks

 tests/functional/test_ip_block_cli.py |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 1 deletions(-)

commit 97474ea43b21c5c2f883b433d845a8411d97e349
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 18:04:32 2011 +0530

    Santhosh/Deepak | Added tests for public block show & delete

 tests/functional/test_ip_block_cli.py |   32 ++++++++++++++----
 tests/unit/factories/__init__.py      |   16 ---------
 tests/unit/factories/models.py        |   59 ---------------------------------
 tests/unit/test_ipam_models.py        |    2 +-
 tests/unit/test_ipam_service.py       |    2 +-
 5 files changed, 27 insertions(+), 84 deletions(-)

commit 9ec49c7ecb21a89ef841e80c60b47a0e67550b63
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jul 1 18:01:01 2011 +0530

    Rajaram|used innodb with mysql so that foreign key constrains are respected

 etc/melange.conf.test                              |    5 +-
 melange/db/api.py                                  |   16 ++---
 melange/db/migrate_repo/schema.py                  |    5 ++
 .../versions/001_add_ip_blocks_table.py            |    7 +-
 .../versions/002_add_ip_addresses_table.py         |    4 +-
 .../versions/003_add_type_to_ip_blocks.py          |    5 +-
 .../migrate_repo/versions/004_add_ip_nat_table.py  |    4 +-
 .../migrate_repo/versions/007_add_policy_table.py  |    6 +-
 .../versions/008_add_ip_ranges_table.py            |    4 +-
 .../versions/010_add_ip_octets_table.py            |    4 +-
 melange/db/session.py                              |   60 +++++++++++++-------
 melange/ipam/models.py                             |   11 +++-
 tests/unit/__init__.py                             |   29 ++++++++++
 tests/unit/test_ipam_models.py                     |   19 +++---
 14 files changed, 119 insertions(+), 60 deletions(-)

commit ae2d75636d2ccd968a0ffe6f93c338502eb20a5b
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 17:43:07 2011 +0530

    Santhosh|Deepak | Moved base test to tests and using models to assert data created in cli tests

 melange/db/session.py                 |    3 ++-
 tests/__init__.py                     |   26 ++++++++++++++++++++++++++
 tests/functional/__init__.py          |   11 +++++++++++
 tests/functional/test_ip_block_cli.py |   17 +++++++++++++++--
 tests/unit/__init__.py                |   29 -----------------------------
 tests/unit/test_ipam_models.py        |    2 +-
 tests/unit/test_ipam_service.py       |    2 +-
 tests/unit/test_versions.py           |    3 ++-
 tests/unit/test_wsgi.py               |    2 +-
 9 files changed, 59 insertions(+), 36 deletions(-)

commit 14961180d569a5707c4481806d735c12753b28a6
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 16:09:15 2011 +0530

    Santhosh/Deepak | Changed usage string, error message and added basic ip block CLI test

 bin/melange-manage                    |   99 +++++++++++++++++++++++++--------
 melange/common/utils.py               |   16 ++++-
 tests/functional/__init__.py          |   40 +++++++++++++-
 tests/functional/test_ip_block_cli.py |   33 +++++++++++
 tests/unit/test_utils.py              |   13 ++++-
 5 files changed, 171 insertions(+), 30 deletions(-)

commit f8fcec99a1f6168e2c6ee7b203e441877ec40409
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jul 1 12:02:00 2011 +0530

    Santhos/Deepak | Added method class to instrospect method args

 melange/common/utils.py  |   29 ++++++++++++++++++++++++++
 tests/unit/test_utils.py |   50 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 0 deletions(-)

commit af3f1bb2901288a6392d1cab1cd84413b33180cd
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 30 17:55:26 2011 +0530

    Santhosh/Deepak | Added CLI for crud on private blocks

 bin/melange-manage |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

commit 6e29508e65cfaadd724852319619ec92aba03578
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 30 17:12:54 2011 +0530

    Santhosh/Deepak | Added CLI for crud on global private and public blocks

 bin/melange-manage       |   66 +++++++++++++++++++++++++++++++++++++---------
 melange/common/client.py |   11 ++++---
 2 files changed, 59 insertions(+), 18 deletions(-)

commit a11a3fa32b2aff7a81358f066755bd0916769768
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jun 30 16:26:54 2011 +0530

    Vinkesh/Rajaram|moved to guids

 melange/common/utils.py                            |    5 ++
 melange/db/api.py                                  |    4 +-
 .../versions/001_add_ip_blocks_table.py            |    3 +-
 .../versions/002_add_ip_addresses_table.py         |    4 +-
 .../migrate_repo/versions/004_add_ip_nat_table.py  |    6 +-
 .../migrate_repo/versions/007_add_policy_table.py  |    2 +-
 .../versions/008_add_ip_ranges_table.py            |    4 +-
 .../versions/009_add_policy_id_to_ip_blocks.py     |    2 +-
 .../versions/010_add_ip_octets_table.py            |    4 +-
 melange/ipam/models.py                             |   12 ++++--
 tests/functional/server.py                         |    2 +-
 tests/unit/__init__.py                             |    3 +
 tests/unit/test_ipam_models.py                     |   33 ++++++++-------
 tests/unit/test_ipam_service.py                    |   43 ++++++++++---------
 14 files changed, 73 insertions(+), 54 deletions(-)

commit a1fca8834c6ba45c996f7f69b754ffaf4385231d
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 30 15:05:48 2011 +0530

    Santhosh/Deepak | Added a CLI for creating a PublicIpBlock

 bin/melange-manage               |  151 ++++++++++++++++++++++++++++++++++++++
 melange/common/client.py         |   55 ++++++++++++++
 melange/ipam/models.py           |    3 +-
 melange/version.py               |   47 ++++++++++++
 tests/functional/client.py       |   52 -------------
 tests/functional/test_service.py |    2 +-
 tests/unit/test_ipam_models.py   |    3 +-
 tests/unit/test_ipam_service.py  |    2 +-
 8 files changed, 259 insertions(+), 56 deletions(-)

commit 87b1f79c6e5bd9934266cf1aa8ee89652f32d7cd
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 29 14:48:43 2011 +0530

    Rajaram/Deepak| moved all finds for models to the model base find_by method

 melange/ipam/models.py          |   50 +++++++----------------
 melange/ipam/service.py         |    2 +-
 tests/unit/test_ipam_models.py  |   85 +++++++-------------------------------
 tests/unit/test_ipam_service.py |   28 ++++++------
 4 files changed, 46 insertions(+), 119 deletions(-)

commit 1c6774ea339c01dfc0eb6449cc9d41bc10040f86
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Wed Jun 29 14:42:38 2011 +0530

    Vinkesh/Santhosh | Added scoping to the update action in IpRange and IpOctets Controllers

 melange/ipam/service.py         |    6 ++++--
 tests/unit/test_ipam_service.py |   38 +++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

commit 23862b0db8721c2fb9b60e1e0b2731b72094d62e
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Wed Jun 29 14:13:48 2011 +0530

    Vinkesh/Santhosh | Modified the creation of ip_range and ip_octet to accept the request body scoped by its model name

 melange/ipam/service.py         |    6 ++-
 tests/unit/test_ipam_service.py |   62 ++++++++++++++++++++++++---------------
 2 files changed, 42 insertions(+), 26 deletions(-)

commit da2d7e69107097a5762f4dbd7b3e46387d889438
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 29 14:10:32 2011 +0530

    Rajaram/Deepak| replaced db_api find by model base finds or gets

 melange/ipam/models.py          |   42 +++++++++++++++++---------------------
 tests/unit/test_ipam_service.py |    8 +++---
 2 files changed, 23 insertions(+), 27 deletions(-)

commit 92d0c8e6ddc75b6da78780fc5e1ddd065a768f3b
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Wed Jun 29 12:42:22 2011 +0530

    Santhosh/Vinkesh | Content type is defaulted to application/json if not provided. Scoped IpAddress create params by ip_address

 melange/common/wsgi.py          |    7 ++-----
 melange/ipam/service.py         |    6 +++---
 tests/unit/test_ipam_service.py |   17 ++++++++---------
 tests/unit/test_wsgi.py         |    5 ++---
 4 files changed, 15 insertions(+), 20 deletions(-)

commit cc07847360b5a271545c7326b0756a5b170fa82a
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 29 12:22:45 2011 +0530

    Rajaram/Deepak | removed mapper resource for ip address and made all connets accept json or xml formats

 melange/ipam/service.py         |   47 +++++++++++++++++++++-----------------
 tests/unit/test_ipam_service.py |    4 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

commit 9b77e6001f85a7d0e6764a1d913dbf4d705aea58
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Wed Jun 29 11:29:02 2011 +0530

    Vinkesh/Santhosh | request params of the IpBlock Create are scoped by ip_block

 melange/ipam/service.py         |   63 ++++++++++++++++++++++++---------------
 tests/unit/test_ipam_service.py |   36 ++++++++++++----------
 2 files changed, 58 insertions(+), 41 deletions(-)

commit 6082d8b6a1a0563de4bc49e7eaa2277f22de3525
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 29 10:25:25 2011 +0530

    Vinkesh/Deepak | Changed policy update to take params scoped by 'policy'

 melange/ipam/service.py         |   12 +++++++++---
 tests/unit/__init__.py          |    4 ++++
 tests/unit/test_ipam_service.py |   26 +++++++++++++++-----------
 3 files changed, 28 insertions(+), 14 deletions(-)

commit 60bd94b424b626a44d4c7bc1268eb3940a569bce
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 18:40:14 2011 +0530

    Vinkesh/Deepak| Fixed the issue where any http exceptions were converted to 500

 melange/common/wsgi.py          |    9 ++++-----
 tests/unit/test_ipam_service.py |    4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

commit 3c228e20909190f3f081a7e066454700d8b53e70
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 18:27:33 2011 +0530

    Vinkesh/Deepak| Scoped policy create params by model name

 melange/common/utils.py         |    9 +++++++++
 melange/common/wsgi.py          |    4 ++++
 melange/ipam/service.py         |    6 +++---
 tests/unit/__init__.py          |    9 +++++++++
 tests/unit/test_ipam_service.py |   14 ++++++++------
 tests/unit/test_utils.py        |   25 ++++++++++++++++++++++++-
 tests/unit/test_wsgi.py         |   32 +++++++++++++++++++++++++++++++-
 7 files changed, 88 insertions(+), 11 deletions(-)

commit eb209a93a3efa0a2f752c6930b63e51cdd46e028
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 28 17:15:20 2011 +0530

    Rajaram/Vinkesh|changed allocate ip from factory test

 tests/unit/test_ipam_models.py |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

commit 321808625ebe02abe21699a6a0b1c068a57c148c
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 28 16:03:20 2011 +0530

    Rajaram/Vinkesh|Added configurable Ip allocation

 melange/ipam/models.py         |   14 +++++++++++++-
 tests/unit/test_ipam_models.py |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletions(-)

commit 6d4e73f3192cfc925c27fb999b46dc87e4fa0eef
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 15:41:13 2011 +0530

    Added api for global private ip blocks (For ServiceNet)

 melange/ipam/service.py         |    5 ++++-
 tests/unit/test_ipam_service.py |   17 +++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

commit a065817f1fa02992c06f5ed0a0c5247b493acc38
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 15:10:06 2011 +0530

    Added default_cidr to conf, backported assertIn method

 etc/melange.conf.sample         |    7 ++-
 etc/melange.conf.test           |    3 +
 tests/unit/__init__.py          |    8 +++-
 tests/unit/test_ipam_service.py |   90 +++++++++++++++++++++++---------------
 4 files changed, 69 insertions(+), 39 deletions(-)

commit 3b6ddd7e20038ef066529e62664334766681aa90
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 14:25:36 2011 +0530

    Reading default cidr from config for creating block

 melange/ipam/models.py          |    6 +++---
 melange/ipam/service.py         |    2 ++
 tests/unit/test_ipam_models.py  |    6 ++++--
 tests/unit/test_ipam_service.py |   10 ++++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)

commit 2cb6112c89d66f2609ffd77bfa1cd679421f0fa3
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 14:06:20 2011 +0530

    Added config for storing app configuration and StubConfig to stub values in unit tests

 melange/common/config.py  |    9 ++++++++
 tests/unit/__init__.py    |   16 +++++++++++++++
 tests/unit/test_config.py |   48 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 0 deletions(-)

commit 5445e8d11c56504b3a6ea5ddb9c5aed727630cb1
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 28 12:07:55 2011 +0530

    Auto create a ip block if no ip block for given network exist while allocating ip

 melange/ipam/models.py          |   12 ++++++++++--
 melange/ipam/service.py         |    3 +--
 tests/unit/test_ipam_models.py  |   18 +++++++++++++-----
 tests/unit/test_ipam_service.py |   28 ++++++++++++++++------------
 4 files changed, 40 insertions(+), 21 deletions(-)

commit f96e69907b8c63f24f9f6fe129d760163b68ce3c
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 18:52:43 2011 +0530

    Vinkesh/Deepak| Return 404 if controller action is missing

 melange/common/wsgi.py  |    7 +++++--
 tests/unit/test_wsgi.py |    7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

commit 225f97a22d1d7a9d205fdb786dbf653a55ed8eb1
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 18:42:23 2011 +0530

    Vinkesh/Deepak| Validate presence of policy name

 melange/ipam/models.py         |    5 ++++-
 tests/unit/test_ipam_models.py |    5 +++++
 2 files changed, 9 insertions(+), 1 deletions(-)

commit 39facc34a7778c7f985ad9f65bfb21ea7e7ac9e4
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 18:24:41 2011 +0530

    Vinkesh/Deepak | Changed duplicate error to return 409 and added tests for exception map

 melange/ipam/service.py         |    6 +-
 tests/unit/test_ipam_service.py |   94 ++++++++++++++++++++++++++-------------
 2 files changed, 66 insertions(+), 34 deletions(-)

commit 1b477d420b9bb1c0630cf7f9b28d759bd279384b
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 27 18:11:49 2011 +0530

    Rajaram|removed HTTP prefix from error response keys

 melange/common/wsgi.py          |    9 +++++----
 tests/unit/test_ipam_service.py |    2 +-
 tests/unit/test_wsgi.py         |   12 +++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

commit b57781672b7a7f4b7687e7db89b75a0cef9aa0b0
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 27 17:41:26 2011 +0530

    Rajaram|errors are now faults in the specific requested contect type

 melange/common/wsgi.py          |   39 ++++++++++++++++++-----
 tests/unit/test_ipam_service.py |   59 +++++++++++++++++-----------------
 tests/unit/test_service.py      |   60 ----------------------------------
 tests/unit/test_wsgi.py         |   67 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 126 insertions(+), 99 deletions(-)

commit a349476a46928dc2440eb515fd030da5933db93c
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 17:21:49 2011 +0530

    Vinkesh/Deepak | Added assert exception message and refactored network.allocate_ip

 melange/common/utils.py        |   36 ++++++++++++++++++++++++++++
 melange/ipam/models.py         |   28 ++++++++++++++++------
 tests/unit/__init__.py         |    9 +++++++
 tests/unit/test_ipam_models.py |   11 +++++++-
 tests/unit/test_utils.py       |   50 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 124 insertions(+), 10 deletions(-)

commit 5c8c2bdecd4e204dc254edade2351ccd1140ff1a
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 16:25:48 2011 +0530

    Vinkesh/Deepak |Network ip allocation for given port and address

 melange/ipam/models.py          |   12 ++++++++----
 melange/ipam/service.py         |    6 ++++--
 tests/unit/test_ipam_models.py  |   39 ++++++++++++++++++++++++++++++++++++++-
 tests/unit/test_ipam_service.py |   32 ++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 7 deletions(-)

commit c70a39df772dd34c3de993f3899f0b1493f9e3e5
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 15:12:20 2011 +0530

    Vinkesh/Deepak | Added tenant scoped allocate ip for a given network

 melange/ipam/models.py          |    4 +-
 melange/ipam/service.py         |    9 ++++++-
 tests/unit/test_ipam_models.py  |   18 +++++++++++---
 tests/unit/test_ipam_service.py |   46 +++++++++++++++++++++++++++++++++-----
 4 files changed, 63 insertions(+), 14 deletions(-)

commit fed7c4679524b6b786b87aa2c3d806d778127090
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 27 14:46:42 2011 +0530

    Rajaram|moved base Controller back to wsgi

 melange/common/config.py            |    4 -
 melange/common/data_types.py        |    3 +-
 melange/common/exception.py         |    5 +-
 melange/common/extensions.py        |    7 +-
 melange/common/service.py           |  119 -----------------------------------
 melange/common/utils.py             |    3 +-
 melange/common/wsgi.py              |  104 +++++++++++++++++++++++++++++-
 melange/db/__init__.py              |    2 -
 melange/ipam/models.py              |    7 +-
 melange/ipam/service.py             |    3 +-
 melange/versions.py                 |    5 +-
 tests/functional/client.py          |    2 -
 tests/functional/test_service.py    |    2 -
 tests/unit/extensions/foxinsocks.py |    4 +-
 tests/unit/test_auth.py             |    4 +-
 tests/unit/test_data_types.py       |    3 +-
 tests/unit/test_extensions.py       |    3 +-
 tests/unit/test_service.py          |    3 +-
 tools/install_venv.py               |    2 -
 19 files changed, 118 insertions(+), 167 deletions(-)

commit 23f05c7860e3582424f2be93b1e6e3bc4e1cd129
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 14:36:06 2011 +0530

    Vinkesh/Deepak | Added logic to choose first free block to allocate ip in the network

 melange/ipam/models.py          |    7 ++++++-
 tests/unit/test_ipam_models.py  |   28 +++++++++++++++++++++++++++-
 tests/unit/test_ipam_service.py |    7 +++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

commit 1c990e334758ca57cc67139c5cfcfb28ea36ee2a
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 27 12:54:05 2011 +0530

    Vinkesh/Deepak | Added ip address allocation for given network

 melange/ipam/models.py          |   13 +++++++++++++
 melange/ipam/service.py         |   13 ++++++++++++-
 tests/unit/factories/models.py  |    2 +-
 tests/unit/test_ipam_models.py  |   20 +++++++++++++++++++-
 tests/unit/test_ipam_service.py |   17 +++++++++++++++++
 5 files changed, 62 insertions(+), 3 deletions(-)

commit 28cc4ca96a531dc88d084e07243d9f48d4505bee
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 27 11:37:06 2011 +0530

    Rajaram| one more functional test for auth

 tests/functional/test_service.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 7f8930422db8bc82e827d5c3c7bf118fb28c9282
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 27 11:14:26 2011 +0530

    Rajaram|added couple more tests for authorization middleware

 melange/common/auth.py  |   18 +++++++++++-----
 melange/ipam/service.py |    2 +-
 tests/unit/test_auth.py |   50 ++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 56 insertions(+), 14 deletions(-)

commit 1db74844200f22a977c0882cb0e2e016bce94c66
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jun 24 17:42:06 2011 +0530

    Rajaram/Santhosh| refactoring tenant scoped authorization

 melange/common/auth.py    |   42 +++++++++++++----
 melange/common/service.py |    4 +-
 melange/common/wsgi.py    |   19 -------
 melange/ipam/service.py   |    8 ++--
 tests/unit/test_auth.py   |  118 ++++++++++++++++++++++++++-------------------
 tests/unit/test_wsgi.py   |   23 ---------
 6 files changed, 109 insertions(+), 105 deletions(-)

commit 6896f846c158aa82863d74bd70008016c89c269d
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jun 24 12:27:58 2011 +0530

    Rajaram/Santosh|Role based authorization in auth middleware

 etc/melange.conf.sample          |    2 +
 melange/common/auth.py           |   34 +++++++-----
 melange/common/extensions.py     |    1 -
 melange/common/service.py        |    7 +--
 melange/common/wsgi.py           |    3 +-
 melange/ipam/service.py          |  103 +++++++++++++++++++++----------------
 tests/functional/test_service.py |    5 +-
 tests/unit/test_auth.py          |  104 +++++++++++++++++++------------------
 tests/unit/test_wsgi.py          |    1 -
 9 files changed, 140 insertions(+), 120 deletions(-)

commit 1a36f302ce440b17533bc34545f4a052fddb3cd3
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Thu Jun 23 16:44:34 2011 +0530

    Vinkesh/Santhosh | Modified the creation of blocks to ignore the type information in the params

 melange/ipam/service.py         |    2 +-
 tests/unit/test_ipam_service.py |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

commit 98cd5e1d5ddbf6767b0ebd80ede0a42c78eac050
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Thu Jun 23 16:07:56 2011 +0530

    Vinkesh/Santhosh | Handling the error for non-existent ip_blocks during CRUD opertions of tenant based IpAddresses

 melange/db/mappers.py           |    4 +--
 melange/ipam/service.py         |   13 +++++---
 tests/unit/factories/models.py  |    2 +
 tests/unit/test_ipam_models.py  |    6 ++++
 tests/unit/test_ipam_service.py |   59 ++++++++++++++++++++++++++++++++++++++-
 5 files changed, 75 insertions(+), 9 deletions(-)

commit fcd2f5867152ef65b66b535bcecf54ef0c8bb866
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Thu Jun 23 12:23:44 2011 +0530

    Vinkesh/Santhosh | Ignoring the tenant_id from the POST body during creation of PrivateIpBlocks. Created shared spec for IpBlockController tests

 melange/ipam/service.py         |    3 +-
 tests/unit/test_ipam_service.py |  148 +++++++++++++++++----------------------
 2 files changed, 65 insertions(+), 86 deletions(-)

commit fc916f2d2f87d8e59ff83929e39f36d72e7a41ce
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Thu Jun 23 11:40:21 2011 +0530

    Vinkesh/Santhosh | Handling the error for non-existent policies during CRUD opertions of tenant based IpOctets

 melange/ipam/service.py         |   15 +++++----
 tests/unit/test_ipam_service.py |   64 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 6 deletions(-)

commit 84bdd3fbcc4e2faf6d399a38431c655d67a332b5
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Thu Jun 23 11:16:48 2011 +0530

    Vinkesh/Santhosh | Handling the error for non-existent policies during CRUD opertions of tenant based IpRanges

 melange/ipam/service.py         |   16 ++++++---
 tests/unit/test_ipam_service.py |   66 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)

commit 1082cfed40eef6d0219f8ba5013cbb923d0b4dd8
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Thu Jun 23 10:53:43 2011 +0530

    Deepak/Rajaram | Added tests for cached properties

 tests/unit/test_ipam_models.py |    7 +++++++
 tests/unit/test_wsgi.py        |    5 +++++
 2 files changed, 12 insertions(+), 0 deletions(-)

commit f4a2302e38ec80e1ef98169266c840e5ae1f6fb9
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 22 18:50:10 2011 +0530

    Rajaram/Vinkesh| Added routes for unusable ip octets for tenant policies

 melange/ipam/service.py         |   10 ++--
 tests/unit/test_ipam_service.py |   79 +++++++++++++++++++++++++-------------
 2 files changed, 57 insertions(+), 32 deletions(-)

commit 9bc15431ba3329c2e32a6a92dc894bfd438c5530
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 18:49:25 2011 +0530

    Moved auth tests to common file test_auth

 tests/unit/test_auth.py            |  144 ++++++++++++++++++++++++++++++++++++
 tests/unit/test_auth_decorator.py  |   88 ----------------------
 tests/unit/test_auth_middleware.py |   76 -------------------
 3 files changed, 144 insertions(+), 164 deletions(-)

commit 471fae75a0b9865b2d75a6d3ddd55a85110f989e
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 18:32:21 2011 +0530

    Moved controller tests to separate file

 tests/unit/test_service.py |   61 ++++++++++++++++++++++++++++++++++++++++++++
 tests/unit/test_wsgi.py    |   43 +------------------------------
 2 files changed, 62 insertions(+), 42 deletions(-)

commit c168279173271341b8d22098190c2bcf625ff16e
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 18:27:53 2011 +0530

    Renamed service test to ipam service test

 tests/unit/test_ipam_service.py |  979 +++++++++++++++++++++++++++++++++++++++
 tests/unit/test_service.py      |  979 ---------------------------------------
 2 files changed, 979 insertions(+), 979 deletions(-)

commit a9a4504abd8591d4303515d52600680d4bec97aa
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 22 18:19:52 2011 +0530

    Rajaram/Vinkesh| Added routes for unusable_ip_ranges for tenant policies

 melange/ipam/service.py    |   32 ++++++++++---------
 tests/unit/test_service.py |   73 +++++++++++++++++++++++++++++--------------
 2 files changed, 66 insertions(+), 39 deletions(-)

commit 9c1603204b169529723a1716d63b814e45d6f989
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 18:19:14 2011 +0530

    Moved authorize decorator to auth module and Controller to service module, Fixed case of admin role

 melange/common/auth.py              |   17 ++++-
 melange/common/extensions.py        |    7 +-
 melange/common/service.py           |  118 +++++++++++++++++++++++++++++++++++
 melange/common/wsgi.py              |  112 +--------------------------------
 melange/ipam/service.py             |    3 +-
 melange/versions.py                 |    3 +-
 tests/unit/extensions/foxinsocks.py |   25 +++----
 tests/unit/test_auth_decorator.py   |   27 +++++++--
 tests/unit/test_auth_middleware.py  |    7 +-
 tests/unit/test_extensions.py       |    3 +-
 tests/unit/test_wsgi.py             |    3 +-
 11 files changed, 184 insertions(+), 141 deletions(-)

commit c74b30b685cc235942ce95755fd0e49f72935de8
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 22 15:25:40 2011 +0530

    Vinkesh/Rajaram|tenant scoped policies

 melange/common/utils.py    |   31 +-------------
 melange/ipam/service.py    |   19 +++++----
 tests/unit/test_service.py |   91 ++++++++++++++++++++++++++++++++++++++++----
 tests/unit/test_utils.py   |   38 ++++--------------
 4 files changed, 105 insertions(+), 74 deletions(-)

commit 27f738d6ba8c250f8ab808221e3bbe2986a19760
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 12:52:40 2011 +0530

    Using cached property for unusable ranges and octets of policy

 melange/common/utils.py        |    1 +
 melange/ipam/models.py         |   25 +++++++++----------------
 melange/ipam/service.py        |    4 ++--
 tests/unit/test_ipam_models.py |    6 +++---
 tests/unit/test_service.py     |    4 ++--
 tests/unit/test_utils.py       |    3 +--
 6 files changed, 18 insertions(+), 25 deletions(-)

commit 09097cd18c385b5abef57e0c32f391923fcb05e4
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 12:13:39 2011 +0530

    Added cached property for memoizing and using it in resource path

 melange/common/auth.py   |    2 +-
 melange/common/utils.py  |   29 +++++++++++++++++++++++++++++
 melange/common/wsgi.py   |    8 ++++----
 tests/unit/test_utils.py |   34 ++++++++++++++++++++++++++++++++++
 tests/unit/test_wsgi.py  |    7 +++----
 5 files changed, 71 insertions(+), 9 deletions(-)

commit a9526745287c40d076c20716c799ac78b18d410e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 22 12:11:43 2011 +0530

    Rajaram/Vinkesh|Create policy scoped by tenants

 .../versions/012_add_tenant_id_to_policies.py      |   32 ++++++++++++++++++++
 melange/ipam/models.py                             |    2 +-
 melange/ipam/service.py                            |   14 +++++----
 tests/unit/test_ipam_models.py                     |    9 +++--
 tests/unit/test_service.py                         |    9 +++++
 5 files changed, 55 insertions(+), 11 deletions(-)

commit 7edea8587829dce5f27815dfff8d528ceaf6c46f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Jun 22 11:33:20 2011 +0530

    Added functional test for authmiddleware and refactored auth middleware

 etc/melange.conf.sample            |    2 +-
 melange/common/auth.py             |   21 +++++------------
 melange/common/wsgi.py             |   43 ++++++++++++++++++++++++++++++++++++
 tests/functional/client.py         |    6 +----
 tests/functional/test_service.py   |   15 +++++++++++-
 tests/unit/test_auth_middleware.py |    7 ++++++
 tests/unit/test_wsgi.py            |   20 ++++++++++++++++
 7 files changed, 91 insertions(+), 23 deletions(-)

commit 17f414126b64337991598d2910f084af38d189e2
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jun 21 17:17:09 2011 +0530

    Vinkesh/Deepak | Fixing test failure due to body in GET request

 tests/unit/test_wsgi.py |  127 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 127 insertions(+), 0 deletions(-)

commit 5db668466511756d18a0772e24fe55946296e4eb
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jun 21 16:54:03 2011 +0530

    Deepak/Vinkesh | Added a functional test for authorization

 etc/melange.conf.sample          |    3 +++
 melange/common/auth.py           |    6 ++++++
 tests/functional/test_service.py |    6 ++++++
 3 files changed, 15 insertions(+), 0 deletions(-)

commit 067139b8c138e88bfe52529a3b628a2057b4e139
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jun 21 12:19:28 2011 +0530

    Deepak/ Vinkesh| Added a decorator to authorize admin actions

 melange/common/wsgi.py            |   19 +++++++++-
 tests/unit/test_auth_decorator.py |   71 +++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 2 deletions(-)

commit b6a0f74e6286c2758611b5d990a35d2ea8d89389
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 21 10:49:25 2011 +0530

    Rajaram|created public and tenant based service tests, created pubic and private ip block factories

 tests/unit/factories/models.py |   13 +++-
 tests/unit/test_ipam_models.py |  163 +++++++++++++++++++---------------------
 tests/unit/test_service.py     |  131 ++++++++++++++------------------
 3 files changed, 144 insertions(+), 163 deletions(-)

commit 0e949c46a47a8fd002e46689dc1b06eb3cdd6fea
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 20 18:16:16 2011 +0530

    Deepak/Vinkesh | Tenant can access resources not scoped by tenant in the url

 melange/common/auth.py             |    3 ++-
 tests/unit/test_auth_middleware.py |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

commit acc38a720fcb071ac6ccb92517109fc9890a7455
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 20 16:35:46 2011 +0530

    Deepak/Vinkesh| Admin can access any resource

 melange/common/auth.py             |   12 +++++++-----
 tests/unit/test_auth_middleware.py |    7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

commit e55a439460ddb1e157cb8ee9d68e196bcb505360
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 20 15:47:17 2011 +0530

    Deepak/Vinkesh | Added a middleware to authorize tenant request

 melange/common/auth.py             |   31 ++++++++++++++++++++
 tests/unit/test_auth_middleware.py |   54 ++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 0 deletions(-)

commit 085216caaec993b53c15515a052b5c33d10466ae
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 20 15:46:25 2011 +0530

    Santhosh/Rajaram|rerouted ip address controller, refactored mappers

 melange/common/wsgi.py         |    1 -
 melange/ipam/service.py        |  160 ++++++++++++++++++---------------------
 tests/unit/factories/models.py |    2 +-
 tests/unit/test_service.py     |  102 +++++++++++++++++---------
 4 files changed, 142 insertions(+), 123 deletions(-)

commit ed006088f85cd128a95918c5e574fe4c4b1c8286
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jun 17 16:01:12 2011 +0530

    Rajaram|split ip blocks into public and private and scoped private blocks by tenant ids

 melange/common/utils.py          |    6 ++-
 melange/common/wsgi.py           |    1 -
 melange/db/api.py                |    4 -
 melange/ipam/models.py           |   14 +++--
 melange/ipam/service.py          |   42 +++++++++---
 tests/functional/test_service.py |    2 +-
 tests/unit/test_ipam_models.py   |   14 +++-
 tests/unit/test_service.py       |  144 +++++++++++++++++++++++++++++---------
 8 files changed, 171 insertions(+), 56 deletions(-)

commit 5a1c861a41e7be4ee7987dcc6d3aaa0be27818c1
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jun 16 16:44:09 2011 +0530

    Rajaram/Deepak|private ip blocks necessarily need a tenant id now

 melange/ipam/models.py         |    7 ++
 melange/ipam/service.py        |    3 +-
 tests/unit/factories/models.py |    1 +
 tests/unit/test_ipam_models.py |  186 ++++++++++++++++++++--------------------
 tests/unit/test_service.py     |   50 ++++++-----
 5 files changed, 128 insertions(+), 119 deletions(-)

commit 40daa086ab5fdad36824d7a90d69483adb88773e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jun 16 15:52:27 2011 +0530

    Deepak/Rajaram|functional tests start and stop with run_test.sh

 bin/melange                      |   10 ++++++----
 etc/melange.conf.sample          |    2 +-
 tests/functional/__init__.py     |   33 +++++++++++++++++++++++++++++++--
 tests/functional/server.py       |   32 ++++++++------------------------
 tests/functional/test_service.py |    3 ++-
 tests/unit/__init__.py           |    2 +-
 6 files changed, 49 insertions(+), 33 deletions(-)

commit 490de61f23641f2ea0f87b9f779955ca8cfded5e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 15 18:24:39 2011 +0530

    Rajaram/Vinkesh|modified model create method to take kwargs for attribs, also added tenant id to ip block

 .../versions/011_add_tenant_id_to_ip_blocks.py     |   33 +++
 melange/ipam/models.py                             |   27 +-
 melange/ipam/service.py                            |   64 ++---
 tests/unit/factories/models.py                     |    2 +-
 tests/unit/test_ipam_models.py                     |  273 ++++++++++----------
 tests/unit/test_service.py                         |  113 +++++----
 6 files changed, 283 insertions(+), 229 deletions(-)

commit 3f009a9a56a8467c2b03e4c8e6c2cd43e62b4681
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Wed Jun 15 17:43:52 2011 +0530

    Santhosh/Deepak | Moved the service restart to functional tests setup

 tests/functional/__init__.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 60e7d8e7d9743e2252c5913c9a4cb8b27c03aebc
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Wed Jun 15 17:23:45 2011 +0530

    Santhosh/Deepak | Refactored code to restart the service while running the tests

 tests/functional/server.py |   93 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 93 insertions(+), 0 deletions(-)

commit 151fd3e3204e7c98e642164ff9ad938ac03de16f
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Wed Jun 15 16:18:21 2011 +0530

    Santhosh/Deepak | Starting and stopping the server to run the functional tests

 melange/common/wsgi.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 38c1a693c821bd6f4ebea68847573a05439e933f
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 14 17:45:54 2011 +0530

    Rajaram| added a version app tests

 tests/unit/test_versions.py |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

commit cebd01cb568bce5ae71c770d58037384b66782d9
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Tue Jun 14 17:33:07 2011 +0530

    Santhosh/Deepak | Added functional tests to verify server Configuration

 etc/melange.conf.sample          |    3 +-
 tests/functional/client.py       |   58 ++++++++++++++++++++++++++++++++++++++
 tests/functional/test_service.py |   44 ++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletions(-)

commit f8d0c1692187c965899e6c806bfdca392a99a23e
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Tue Jun 14 12:31:20 2011 +0530

    Santhosh\Deepak | Cascade delete policy's octets

 melange/ipam/models.py         |    3 ++-
 tests/unit/test_ipam_models.py |   12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

commit 4a422bf270a4f962ca58872e8ad3199962339c6e
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Tue Jun 14 12:17:31 2011 +0530

    Santhosh/Deepak | Added a wrapper for the data types which is used for column type validation

 melange/common/data_types.py   |   39 +++++++++++++++++++++++++++++++++++++++
 melange/common/utils.py        |   21 ++-------------------
 melange/ipam/models.py         |    8 ++++----
 tests/unit/test_data_types.py  |   40 ++++++++++++++++++++++++++++++++++++++++
 tests/unit/test_ipam_models.py |   14 +++-----------
 tests/unit/test_utils.py       |   21 ---------------------
 6 files changed, 88 insertions(+), 55 deletions(-)

commit 391003276409de3bc0be8e86b0640fae962a4f83
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Tue Jun 14 11:30:35 2011 +0530

    Santhosh\Deepak | Tested conversion of boolean columns in model

 melange/common/utils.py        |    4 ++--
 melange/ipam/models.py         |    6 +++---
 tests/unit/test_ipam_models.py |   14 ++++++++++----
 tests/unit/test_utils.py       |   21 +++++++++++++++++++++
 4 files changed, 36 insertions(+), 9 deletions(-)

commit 927f95aee1b99e362c43919ca71faf7f5b3ecd3a
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Tue Jun 14 10:53:46 2011 +0530

    Santhosh/Deepak | Separated column type validations and type convertions

 melange/ipam/models.py |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

commit a239b8dc967d37b97e40b7b80ad2826eae27329c
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Tue Jun 14 10:08:27 2011 +0530

    Deepak/Vinkesh | Added a method to check for proper column type before validation

 melange/ipam/models.py         |   17 +++++++++++------
 tests/unit/test_ipam_models.py |   28 +++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 9 deletions(-)

commit 43794f10b95a2e4552b1933fea5bc33ea0dd2b28
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 13 18:02:18 2011 +0530

    Rajaram|versioning added to app config

 bin/melange                |    1 -
 etc/melange.conf.sample    |   11 +++++++++--
 etc/melange.conf.test      |   23 +++++++++++++++++------
 melange/ipam/service.py    |    1 -
 melange/versions.py        |   13 ++++++-------
 tests/unit/test_service.py |    4 ++--
 6 files changed, 34 insertions(+), 19 deletions(-)

commit 0f6d68e8b0d186b5a7b96c2a724e78140c648351
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 13 15:32:40 2011 +0530

    Vinkesh/Deepak| Added crud for ip octets and renamed the uri

 melange/ipam/models.py         |   24 ++++---
 melange/ipam/service.py        |   77 +++++++++++++++------
 tests/unit/test_ipam_models.py |   12 +++-
 tests/unit/test_service.py     |  149 ++++++++++++++++++++++++++++++++--------
 4 files changed, 199 insertions(+), 63 deletions(-)

commit 319549e024821ab1544fafb2f3c2d427e55153f1
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 13 15:19:46 2011 +0530

    Rajaram/Deepak|fixed xml support

 melange/common/wsgi.py     |   22 ++++++++++++---
 melange/ipam/service.py    |   46 ++++++++++++--------------------
 tests/unit/test_service.py |   62 ++++++++++++++++++++-----------------------
 3 files changed, 64 insertions(+), 66 deletions(-)

commit dcf6335ced609e2198a8da1319018ff1fc17c83c
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Mon Jun 13 14:32:24 2011 +0530

    Vinkesh/Deepak | Added ip octet create api, added before save hook to convert columns to their type in the model

 melange/common/utils.py        |    2 +-
 melange/ipam/models.py         |   21 +++++++++++++++++++++
 melange/ipam/service.py        |   12 ++++++++++++
 tests/unit/test_ipam_models.py |   30 ++++++++++++++++++++++++++++++
 tests/unit/test_service.py     |   14 +++++++++++++-
 tests/unit/test_utils.py       |   31 +++++++++++++++++++++++++++++++
 6 files changed, 108 insertions(+), 2 deletions(-)

commit 44b2a54514c9ca0442cc4d188159499c94f818e4
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Fri Jun 10 17:08:46 2011 +0530

    Vinkesh | Policy#allows methods now checks if given address' last octet matches unusable IpOctets

 melange/ipam/models.py         |   11 +++++++++++
 tests/unit/test_ipam_models.py |   18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

commit 5fdfe0f5fa765dd3426455e58904a68366903ee4
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Fri Jun 10 16:45:36 2011 +0530

    Vinkesh | Added ip_octet model

 melange/db/mappers.py                              |    2 +
 .../versions/010_add_ip_octets_table.py            |   53 ++++++++++++++++++++
 melange/ipam/models.py                             |   12 ++++-
 tests/unit/factories/models.py                     |    4 ++
 tests/unit/test_ipam_models.py                     |   25 +++++++++-
 5 files changed, 93 insertions(+), 3 deletions(-)

commit 299e54ab357422fac86df58ac5b3cf06d63c1c8b
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Fri Jun 10 12:57:08 2011 +0530

    Vinkesh | Deletion of Policy will remove policy_id in associated IpBlocks

 melange/ipam/models.py         |    6 ++++++
 tests/unit/test_ipam_models.py |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

commit 57e4d5c2bc37f652c7f9ee742a297fedb1a45f03
Author: Vinkesh Banka <vinkeshb@thoughtworks.com>
Date:   Fri Jun 10 12:00:21 2011 +0530

    Vinkesh | Added API for deletion of policies. Deletion of policy will now cascade delete ip_ranges too

 melange/ipam/models.py         |    4 +++
 melange/ipam/service.py        |    4 +++
 tests/unit/test_ipam_models.py |   20 ++++++++++++------
 tests/unit/test_service.py     |   41 +++++----------------------------------
 4 files changed, 27 insertions(+), 42 deletions(-)

commit ca7cb4c8b77c5ca1aca448eed8c10c0e8cc0113a
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jun 10 10:45:48 2011 +0530

    Santhosh | Fixed few pep8 errors

 melange/versions.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e41f68a973e319da14c96b2a3f725a70eaf68408
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jun 10 10:36:26 2011 +0530

    Santhosh/Deepak | Exposed Versioning in the url for melange API

 melange/common/wsgi.py |  104 ++++++++++++++++++++++++++++++++++++------------
 melange/versions.py    |   70 ++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 26 deletions(-)

commit 54bff85b711a9aa813d4113236dd70e61bb8fe18
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jun 9 18:54:18 2011 +0530

    Vinkesh | Fixed minor pep8 violations

 tests/unit/test_extensions.py |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

commit 3f426c528f708a3d6f9f35ee8b8625c4e187bc9e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu Jun 9 18:08:09 2011 +0530

    Rajaram/Vinkesh | Added API to delete IpBlocks. Changed the way limit, marker and marker_column is applied to any query. Now, db_api.find_all_by method does not add a limit filter to the query

 etc/melange.conf.test          |   16 +++++++---------
 melange/db/api.py              |   27 +++++++++++++++++++--------
 melange/ipam/models.py         |   15 +++++++++++++--
 melange/ipam/service.py        |   36 +++++++++++++-----------------------
 tests/functional/__init__.py   |   25 -------------------------
 tests/unit/__init__.py         |   20 ++++++++++++--------
 tests/unit/factories/models.py |    8 ++++++++
 tests/unit/test_extensions.py  |   23 ++++-------------------
 tests/unit/test_ipam_models.py |   34 +++++++++++++++++++++++++++-------
 tests/unit/test_service.py     |    7 +++----
 10 files changed, 106 insertions(+), 105 deletions(-)

commit a4f01e2b93ec9e83743ec8e490f85068916eac4d
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 9 12:48:16 2011 +0530

    Santhosh/Deepak | Modified the melange.conf.sample to use the pipeline instead of composite feature of paste

 etc/melange.conf.sample |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

commit efdbd18b7bbac2991282fc24dc3ef27702e61b0f
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 9 12:39:44 2011 +0530

    Santhosh/Deepak | Added test to verify the extensions middleware loaded though paste.filter

 etc/melange.conf.test         |    7 +++++--
 tests/unit/test_extensions.py |   18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

commit 522fbd86973fd8261a5d65495e5deef4a207ee27
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Wed Jun 8 17:54:39 2011 +0530

    Santhosh/Vinkesh | Used Pipeline and Filter to load the extensions. Added an extensions folder for adding the extension implementations

 etc/melange.conf.sample       |   32 ++++++++++++++++++++++++++++----
 etc/melange.conf.test         |   13 ++++++-------
 extensions/__init__.py        |   15 +++++++++++++++
 melange/common/config.py      |    5 +----
 melange/common/extensions.py  |   14 +++++++-------
 tests/unit/test_extensions.py |    3 ++-
 6 files changed, 59 insertions(+), 23 deletions(-)

commit 4c261a5c641f4b64c033d0b7c1f0257a69be9fa2
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 7 14:37:05 2011 +0530

    Vinkesh/Rajaram| added update action for policy

 melange/ipam/service.py    |   22 +++++++++++++++++++++-
 tests/unit/test_service.py |   30 ++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletions(-)

commit 18cf6d28be0c5cd70c9c411f44fbdac21b371e1a
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue Jun 7 11:56:52 2011 +0530

    Vinkesh/Rajaram| factory_boy for test data creation and updates for unusable ip ranges

 melange/ipam/models.py           |   12 +-
 melange/ipam/service.py          |    5 +
 tests/unit/factories/__init__.py |   16 ++
 tests/unit/factories/models.py   |   35 ++++
 tests/unit/test_service.py       |  368 +++++++++++++++++++++++---------------
 5 files changed, 286 insertions(+), 150 deletions(-)

commit b8cadc5bb9351da8a27e3b7ae066e2442c7cd5f9
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 6 16:17:18 2011 +0530

    Added show, index and delete for unusable ip ranges

 melange/ipam/models.py         |    6 +++++
 melange/ipam/service.py        |   13 +++++++++++
 tests/unit/test_ipam_models.py |   16 +++++++++++++
 tests/unit/test_service.py     |   47 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 0 deletions(-)

commit 187a22e05d6984be55efb9b5ddb51b69e7eadd22
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon Jun 6 15:00:33 2011 +0530

    Deepak/Rajaram|ip range validations

 melange/common/utils.py        |   13 ++++++-----
 melange/ipam/models.py         |   45 +++++++++++++++++++++++++++++----------
 tests/unit/test_ipam_models.py |   26 ++++++++++++++++++++--
 tests/unit/test_service.py     |   13 ++++++++--
 4 files changed, 73 insertions(+), 24 deletions(-)

commit 94849ff5f5643a19e28e113b9b4f0f6f9795b4b7
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jun 3 17:17:22 2011 +0530

    Santhosh/Deepak | Exposed API for creating UnusableRanges for a policy, removed the eager load for policy as it was just caching

 melange/ipam/models.py         |   43 +++++++++++++++++----------------------
 melange/ipam/service.py        |   12 +++++++++++
 tests/unit/test_ipam_models.py |   23 ++++++++++++++++++--
 tests/unit/test_service.py     |   29 +++++++++++++++++++++-----
 4 files changed, 74 insertions(+), 33 deletions(-)

commit dfc2464b0f2cf25136c8e4c5b87ccac5d6ba4860
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jun 3 15:57:12 2011 +0530

    Vinkesh/Rajaram|added extensions to app

 etc/melange.conf.test         |   11 +++++-
 melange/common/config.py      |    5 +++
 melange/common/extensions.py  |   67 +++++++++++++++++++---------------------
 tests/unit/test_extensions.py |   66 +++++++++++----------------------------
 4 files changed, 65 insertions(+), 84 deletions(-)

commit 9783f02b80fb98e41a15935137695973d1624137
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Fri Jun 3 14:17:29 2011 +0530

    Santhosh/Deepak | Modified the route mappings for InsideLocalsController

 melange/ipam/service.py |   49 +++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 20 deletions(-)

commit 26922e74aa67e2f46f11f8628343cfab4136bb45
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri Jun 3 11:12:48 2011 +0530

    Vinkesh/Rajaram|cleaned up test_extensions

 tests/unit/test_extensions.py |  272 ++++++++++++++++++++--------------------
 1 files changed, 136 insertions(+), 136 deletions(-)

commit 215750e0737711d98a0a3c19936c7faca5669826
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 19:13:14 2011 +0530

    Santhosh/Vinkesh | Exposed API to show a policy

 melange/ipam/service.py    |    3 +++
 tests/unit/test_service.py |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

commit 30d3c5a96e69612f36e6d3dbcc85090981d4b14d
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 18:54:42 2011 +0530

    Santhosh/Vinkesh | Added index action to list all the policies

 melange/ipam/models.py         |    8 ++++----
 melange/ipam/service.py        |    5 +++++
 tests/unit/test_ipam_models.py |   10 +++++++++-
 tests/unit/test_service.py     |   15 ++++++++++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

commit b4195167c132428c7980345c840d8f5cec54f84f
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 17:45:51 2011 +0530

    Santhosh/Vinkesh | Exposed an API for creation of policy

 melange/ipam/models.py         |    3 +++
 melange/ipam/service.py        |   20 +++++++++++++++-----
 tests/unit/test_ipam_models.py |    7 +++++++
 tests/unit/test_service.py     |   38 ++++++++++----------------------------
 4 files changed, 35 insertions(+), 33 deletions(-)

commit 542945f56ce614cb05639238bd73dcb5397a3980
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 15:33:00 2011 +0530

    Santhosh/Vinkesh | Modified the params of eager load for policy to load rules by default

 melange/ipam/models.py |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

commit 77df741ccdf16e7ca794a8c9c0815399a7cf2cfb
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 15:03:54 2011 +0530

    Santosh/Vinkesh | Eager loading ip_rules while loading policy

 melange/ipam/models.py         |   43 ++++++++++++++++++++++++++++-----------
 tests/unit/test_ipam_models.py |    9 ++++++++
 2 files changed, 40 insertions(+), 12 deletions(-)

commit f788c18f609355e14663a246ad846141357fff45
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu Jun 2 10:17:32 2011 +0530

    Santhosh/Deepak | Added Extensions to IPAM

 etc/melange.conf.sample             |    3 +
 etc/melange.conf.test               |    3 +
 melange/common/extensions.py        |  442 +++++++++++++++++++++++++++++++++++
 melange/common/wsgi.py              |   34 +++
 melange/ipam/service.py             |    2 +-
 tests/unit/extensions/__init__.py   |   15 ++
 tests/unit/extensions/foxinsocks.py |  100 ++++++++
 tests/unit/test_extensions.py       |  244 +++++++++++++++++++
 8 files changed, 842 insertions(+), 1 deletions(-)

commit debb904461de0a1120bfc6fdf5b3e0d6e1c3f92d
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 1 17:44:52 2011 +0530

    Vinkesh/Rajaram|ip generation checks policy, handled negative offset for ip range

 melange/ipam/models.py         |   15 ++++++++++-----
 tests/unit/test_ipam_models.py |   28 ++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

commit 04dcd2379d96215e617e8abc29eb87793eb91ea1
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed Jun 1 14:23:55 2011 +0530

    Vinkesh/Rajaram|Policy with range rules for allocating ips

 melange/common/wsgi.py                             |    1 +
 melange/db/mappers.py                              |   13 +-
 .../migrate_repo/versions/007_add_policy_table.py  |   49 ++++
 .../versions/008_add_ip_ranges_table.py            |   54 +++++
 .../versions/009_add_policy_id_to_ip_blocks.py     |   39 +++
 melange/ipam/models.py                             |   70 +++++-
 tests/unit/test_ipam_models.py                     |  246 ++++++++++++-------
 7 files changed, 363 insertions(+), 109 deletions(-)

commit 9fe6cd6fe40c7c89ad539a7f13c0980855f98573
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Wed Jun 1 10:29:53 2011 +0530

    Santhosh/Rajaram|Worked on changing the nat controller to have a better REST API

 melange/ipam/service.py    |   59 +++++++++++++++++++++----------------------
 tests/unit/test_service.py |   28 +++++++++++++++++++++
 2 files changed, 57 insertions(+), 30 deletions(-)

commit 4318cbc671aea18a93350540980a96e48a1e7eaf
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 27 11:39:01 2011 +0530

    Rajaram/Santhosh|Added deletion of specific ip nats and other border error conditions

 melange/common/wsgi.py         |   13 +++--
 melange/db/api.py              |   65 +++++++++++++++++--------
 melange/ipam/models.py         |   32 +++++++++----
 melange/ipam/service.py        |   36 +++++++++-----
 tests/unit/test_ipam_models.py |   51 +++++++++++++++++++-
 tests/unit/test_service.py     |  102 ++++++++++++++++++++++++++++++++++++++--
 6 files changed, 245 insertions(+), 54 deletions(-)

commit 222b55a6e0730f4dd183428b4cfabd795f578059
Author: Santhosh <santhosh.m@thoughtworks.com>
Date:   Thu May 26 17:52:15 2011 +0530

    Rajaram/Santhosh|added restore to IpAddress, added a scheduler to delete the deallocated jobs.

 melange/db/api.py              |   16 ++++++++++++----
 melange/ipam/models.py         |   12 ++++++++++--
 melange/ipam/scheduler.py      |   40 ++++++++++++++++++++++++++++++++++++++++
 melange/ipam/service.py        |   13 ++++++++++++-
 tests/unit/test_ipam_models.py |   24 ++++++++++++++++++++++--
 tests/unit/test_service.py     |   20 ++++++++++++++++++++
 6 files changed, 116 insertions(+), 9 deletions(-)

commit 40d82a6119cd403a698544a2cfa61815bb2b1265
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 24 14:28:03 2011 +0530

    Rajaram/Santhosh|delayed address deallocation and some error scenarios covered

 melange/common/exception.py                        |   24 +++--
 melange/common/wsgi.py                             |   40 +++++++++-
 melange/db/api.py                                  |    5 +-
 .../006_add_deallocated_to_ip_addresses.py         |   34 ++++++++
 melange/ipam/models.py                             |   90 +++++++++++++++-----
 melange/ipam/service.py                            |   44 ++++++----
 tests/unit/test_ipam_models.py                     |   29 ++++++-
 tests/unit/test_service.py                         |   36 +++++++-
 8 files changed, 244 insertions(+), 58 deletions(-)

commit 24e012c08f5bf72c87269ce33307b6f764535e20
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 24 00:24:11 2011 -0400

    making an attempt at python style points

 tests/unit/test_service.py |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

commit aad5100c4c487d2fcc26b2d64ef82348f49ad3b8
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon May 23 10:29:59 2011 +0530

    removing nat relationships

 melange/db/api.py              |   22 ++++++++++++++---
 melange/ipam/models.py         |    9 +++++-
 melange/ipam/service.py        |   12 +++++++++
 tests/unit/test_ipam_models.py |   50 ++++++++++++++++++++++++++++++++++++++-
 tests/unit/test_service.py     |   28 ++++++++++++++++++++++
 5 files changed, 113 insertions(+), 8 deletions(-)

commit d490882c73155e89c4d38c5bad6205d4f864bcb6
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 20 15:33:54 2011 +0530

    Rajaram/Santhosh|Modified the delete operation to do soft deletion

 melange/db/api.py                                  |    6 ++-
 ..._soft_delete_to_blocks_addresses_and_ip_nats.py |   37 ++++++++++++++++++++
 melange/db/session.py                              |    4 ++
 melange/ipam/models.py                             |    3 +-
 tests/unit/test_ipam_models.py                     |    8 +++--
 5 files changed, 52 insertions(+), 6 deletions(-)

commit 692ce7ab6ecf1e25f7f66bd92ccb3c9f78c8575a
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 20 14:08:53 2011 +0530

    Rajaram/Santhosh|Added index and pagination on ip blocks

 melange/db/session.py          |   14 ++++++-
 melange/ipam/models.py         |    4 ++
 melange/ipam/service.py        |   13 +++---
 tests/unit/__init__.py         |   15 ++++++-
 tests/unit/test_ipam_models.py |   27 ++++++++++++-
 tests/unit/test_service.py     |   89 +++++++++++++++++++++++++---------------
 6 files changed, 119 insertions(+), 43 deletions(-)

commit 72ebe6d0592d70a71293dbc070bfa23f0dcc7195
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 19 15:28:55 2011 +0530

    Rajaram/Santhosh|fixed pep8 warnings

 melange/__init__.py                                |    1 -
 melange/db/api.py                                  |   24 ++-
 melange/db/mappers.py                              |   35 ++--
 .../versions/001_add_ip_blocks_table.py            |    8 +-
 .../versions/002_add_ip_addresses_table.py         |   19 +-
 .../versions/003_add_type_to_ip_blocks.py          |    3 +-
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   22 ++--
 melange/db/session.py                              |   18 +-
 melange/ipam/models.py                             |   83 +++++----
 melange/ipam/service.py                            |   94 ++++++-----
 tests/functional/__init__.py                       |    8 +-
 tests/unit/__init__.py                             |    6 +-
 tests/unit/test_ipam_models.py                     |  135 ++++++++-------
 tests/unit/test_service.py                         |  181 +++++++++++---------
 14 files changed, 358 insertions(+), 279 deletions(-)

commit 2de41db2d6aeec74c28786bf7116f4a8f01ae95e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 19 12:27:58 2011 +0530

    Rajaram/Santhosh|Added pagination to inside_globals and inside_locals

 bin/melange                |   14 ++++----
 melange/ipam/service.py    |    6 ++-
 tests/unit/test_service.py |   78 ++++++++++++++++++++++++++++++--------------
 3 files changed, 64 insertions(+), 34 deletions(-)

commit 4461f061cbf25b2884e9b467fd1d938c3ea91724
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 19 10:45:12 2011 +0530

    Rajaram/Santhosh|Introduced pagination for ipaddresses

 melange/db/api.py              |   35 +++++++++++++++++++++++------------
 melange/ipam/models.py         |   12 ++++++------
 melange/ipam/service.py        |    7 ++++++-
 tests/unit/test_ipam_models.py |   26 ++++++++++++++++++++++++++
 tests/unit/test_service.py     |   12 ++++++++++++
 5 files changed, 73 insertions(+), 19 deletions(-)

commit 7cecd017ea28b2eddad556ae6dca14512c63b4c0
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 17 18:55:10 2011 +0530

    Rajaram/Santhosh|added show of inside_locals and creation of inside_globals to ip_nat

 melange/db/api.py              |    6 +++-
 melange/ipam/models.py         |   10 +++++---
 melange/ipam/service.py        |   45 +++++++++++++++++++++++++++------------
 tests/unit/test_ipam_models.py |    4 +-
 tests/unit/test_service.py     |   32 ++++++++++++++++++++++++++++
 5 files changed, 75 insertions(+), 22 deletions(-)

commit 1734739d6f937fbcc16d2dbb67a04eb20dd3bd87
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 17 17:36:26 2011 +0530

    Rajaram/Santhosh|added show inside_globals to ip_nat

 melange/ipam/models.py         |   14 +++++++++-
 melange/ipam/service.py        |   58 +++++++++++++++++++--------------------
 tests/unit/test_ipam_models.py |   15 ++++++++++
 tests/unit/test_service.py     |   25 ++++++-----------
 4 files changed, 65 insertions(+), 47 deletions(-)

commit c30708a82c4ce34da23a74be535527eb07e4b0bf
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 17 16:26:06 2011 +0530

    Rajaram/Santhosh|ip natting

 melange/db/api.py                                  |   23 ++++++++-
 melange/db/mappers.py                              |   21 +++++++-
 .../migrate_repo/versions/004_add_ip_nat_table.py  |   54 ++++++++++++++++++++
 melange/db/session.py                              |    5 ++-
 melange/ipam/models.py                             |   47 +++++++++++++----
 melange/ipam/service.py                            |   20 +++++++-
 tests/unit/test_ipam_models.py                     |   47 ++++++++++++++---
 tests/unit/test_service.py                         |   40 +++++++--------
 8 files changed, 210 insertions(+), 47 deletions(-)

commit 7dc79de67513a4a4a8fc84d6a2ff0dfdccf6c979
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 13 18:55:05 2011 +0530

    Rajaram/Santhosh|wip tests for natting

 melange/ipam/models.py     |    3 ++
 tests/unit/test_service.py |   63 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 58 insertions(+), 8 deletions(-)

commit ae0a7e8b4cb7026fe27d79f066ac8c7eb5d4b3f7
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 13 17:54:17 2011 +0530

    Rajaram/Santhosh|Renamed test_ip_blocks_controller to test_service

 tests/unit/test_ip_blocks_controller.py |  144 -------------------------------
 tests/unit/test_service.py              |  144 +++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 144 deletions(-)

commit 21f9d5ef27565ae3fb12a6be92d62ac26b0e3c7e
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Fri May 13 14:18:45 2011 +0530

    Rajaram/Santhosh|added public ip block uniqueness validation

 melange/db/api.py                                  |   23 +++++--------
 .../versions/003_add_type_to_ip_blocks.py          |   32 ++++++++++++++++++++
 melange/ipam/models.py                             |   27 ++++++++++++-----
 melange/ipam/service.py                            |    4 +-
 tests/unit/test_ip_blocks_controller.py            |   10 ++++++
 tests/unit/test_ipam_models.py                     |   11 ++++++-
 6 files changed, 82 insertions(+), 25 deletions(-)

commit 9efa7fb3e7ef74e90ba7b6afd9775b726e445d2a
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 12 17:26:20 2011 +0530

    Rajaram/Santhosh|dellocation of ip

 melange/db/api.py                       |   13 +++++++++++++
 melange/ipam/models.py                  |   11 ++++++++++-
 melange/ipam/service.py                 |   19 ++++++++++++++-----
 tests/unit/test_ip_blocks_controller.py |   30 +++++++++++++++++++++---------
 tests/unit/test_ipam_models.py          |   21 +++++++++++++++++++++
 5 files changed, 79 insertions(+), 15 deletions(-)

commit 97fb0302619ef196333d738393e8f6b8d3ffdae9
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 12 14:55:25 2011 +0530

    Rajaram/Santhosh|switched from IPy to netaddr and added cidr validations

 melange/ipam/models.py                  |   51 +++++++++++++++++++++++++-----
 melange/ipam/service.py                 |   13 +++++--
 tests/unit/test_ip_blocks_controller.py |   11 +++++-
 tests/unit/test_ipam_models.py          |   32 ++++++++++++++-----
 4 files changed, 83 insertions(+), 24 deletions(-)

commit c9feb5083d77f0272da70e9318baf2eda6c236df
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Thu May 12 11:15:42 2011 +0530

    Santhosh/Rajaram|port id is part of ip address allocation

 .../versions/002_add_ip_addresses_table.py         |    1 -
 melange/ipam/models.py                             |    7 ++++-
 melange/ipam/service.py                            |   16 ++++++++----
 tests/unit/test_ip_blocks_controller.py            |   26 ++++++++++++++++++-
 tests/unit/test_ipam_models.py                     |   22 ++++++++++++++++-
 5 files changed, 62 insertions(+), 10 deletions(-)

commit db0319c35b3188e78a6e9343a350ee3274adcbd4
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed May 11 15:22:29 2011 +0530

    Rajaram/Santhosh|rest calls for ip address allocation

 bin/melange                             |    6 +++-
 melange/ipam/service.py                 |   28 ++++++++++++++--
 tests/unit/test_ip_blocks_controller.py |   53 +++++++++++++++++++++++++++---
 3 files changed, 77 insertions(+), 10 deletions(-)

commit ef32be9245602610ecd62fd39f8901f07047e231
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Wed May 11 12:43:30 2011 +0530

    Rajaram/Santhosh|Pushed the mapping of the models with DB into mappers.py, added an api for db

 melange/db/api.py                                  |   35 ++++++++
 melange/db/mappers.py                              |   31 +++++++
 .../versions/001_add_ip_blocks_table.py            |    9 ++-
 .../versions/002_add_ip_addresses_table.py         |    2 +-
 melange/db/session.py                              |   13 +++-
 melange/ipam/models.py                             |   83 ++++++--------------
 melange/ipam/service.py                            |    4 +-
 tests/unit/__init__.py                             |    3 +-
 tests/unit/test_ipam_models.py                     |    6 +-
 9 files changed, 116 insertions(+), 70 deletions(-)

commit 5410ba15a9f5dc2e81e1edc64479886e47e980c9
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 10 18:29:22 2011 +0530

    Rajaram/Santhosh|Created IpAddress table, associate it to IpBlock, added allocate_ip to IpBlock

 .../versions/002_add_ip_addresses_table.py         |   52 ++++++++++++++++
 melange/db/session.py                              |    2 +-
 melange/ipam/models.py                             |   37 +++++++++--
 melange/ipam/service.py                            |   14 ++++-
 tests/unit/test_ip_blocks.py                       |   49 ---------------
 tests/unit/test_ipam_models.py                     |   64 ++++++++++++++++++++
 6 files changed, 158 insertions(+), 60 deletions(-)

commit b7c48861881acfff07db73107fd521f74ab90ade
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 10 12:30:04 2011 +0530

    Rajaram/Santhosh|added show ip block

 melange/ipam/models.py                  |   21 ++++++++++++++-------
 melange/ipam/service.py                 |   12 ++++++++++--
 tests/unit/test_ip_blocks.py            |   18 ++++++++++--------
 tests/unit/test_ip_blocks_controller.py |   19 +++++++++++++++----
 4 files changed, 49 insertions(+), 21 deletions(-)

commit d3d26b903261ac7d22f2b55d2ed9dbe3d724d76c
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Tue May 10 11:32:29 2011 +0530

    Rajaram/Santhosh|added api call to create ip blocks

 bin/melange                                  |   23 ++++++++++++++-
 etc/melange.conf.test                        |    8 ++---
 melange/__init__.py                          |   17 +++++++++++
 melange/db/migrate_repo/__init__.py          |   17 +++++++++++
 melange/db/migrate_repo/manage.py            |   16 ++++++++++
 melange/db/migrate_repo/versions/__init__.py |   17 +++++++++++
 melange/db/session.py                        |   17 +++++++++++
 melange/ipam/__init__.py                     |   16 ++++++++++
 melange/ipam/models.py                       |    5 +++
 melange/ipam/service.py                      |   37 +++++++++++++++++++++--
 tests/__init__.py                            |   16 ++++++++++
 tests/functional/__init__.py                 |   17 +++++++++++
 tests/unit/__init__.py                       |   17 +++++++++++
 tests/unit/test_ip_blocks.py                 |   37 +++++++++++++++++++++--
 tests/unit/test_ip_blocks_controller.py      |   41 ++++++++++++++++++++++++++
 tools/with_venv.sh                           |   17 +++++++++++
 16 files changed, 304 insertions(+), 14 deletions(-)

commit 82d80512b0575d700dc97462a1eb14f61400ebb0
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon May 9 18:23:47 2011 +0530

    moved ip_block tests to unit

 tests/functional/melange.sqlite    |  Bin 8192 -> 0 bytes
 tests/functional/test_ip_blocks.py |   18 ------------------
 tests/unit/__init__.py             |   22 ++++++++++++++++++++++
 tests/unit/test_ip_blocks.py       |   18 ++++++++++++++++++
 4 files changed, 40 insertions(+), 18 deletions(-)

commit 053903ca397607da8f3bbf743075ceca13cfd9fd
Author: rajarammallya <rajarammallya@gmail.com>
Date:   Mon May 9 18:13:45 2011 +0530

    initial repo for melange

 bin/melange                                        |   45 +++
 etc/melange.conf.sample                            |   15 +
 etc/melange.conf.test                              |   31 ++
 melange/common/__init__.py                         |   16 +
 melange/common/config.py                           |  328 ++++++++++++++++++++
 melange/common/exception.py                        |   98 ++++++
 melange/common/utils.py                            |  217 +++++++++++++
 melange/common/wsgi.py                             |  315 +++++++++++++++++++
 melange/db/__init__.py                             |   39 +++
 melange/db/migrate_repo/README                     |    4 +
 melange/db/migrate_repo/__init__.py                |    1 +
 melange/db/migrate_repo/manage.py                  |    3 +
 melange/db/migrate_repo/migrate.cfg                |   20 ++
 melange/db/migrate_repo/schema.py                  |  103 ++++++
 .../versions/001_add_ip_blocks_table.py            |   43 +++
 melange/db/migrate_repo/versions/__init__.py       |    1 +
 melange/db/migration.py                            |  125 ++++++++
 melange/db/session.py                              |   40 +++
 melange/ipam/models.py                             |  107 +++++++
 melange/ipam/service.py                            |   24 ++
 tests/functional/__init__.py                       |   22 ++
 tests/functional/melange.sqlite                    |  Bin 0 -> 8192 bytes
 tests/functional/test_ip_blocks.py                 |   18 +
 23 files changed, 1615 insertions(+), 0 deletions(-)

commit 85b13b1b4bab10756af2aee0c127a3e6067845dd
Merge: 95b457c b2a8720
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 6 18:58:44 2011 +0000

    Merge "Stop returning correct password on api calls"

commit 95b457c1345fe6019a96c8081fed51fa29a91c8d
Merge: a0c0c3d 7f2a043
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 b2a8720b134bc5fe7b9934dd3ffbf7269498c4f8
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a0c0c3d5af977d1fecdad1c966c9bd6c4cbdd1ad
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

commit a02e45b8614b9f7766ccd583b89523403d1a9751
Merge: 6cc7991 4edb32a
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 6cc799177c1aeb67593364a2187f6c150283d72a
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

commit b333c015ecad0501407525cd5c771a0370347b2e
Merge: 5dadcf5 ae598ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 17:14:24 2011 +0000

    Merge "Deallocate ip if build fails."

commit 5dadcf59a9955f8c5c2b136b43cf20eb182b4cb6
Merge: 0bb8a6c f51864e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 17:04:39 2011 +0000

    Merge "Moving admin actions to extension"

commit 0bb8a6cfcbfa42f2fbf0f285db726db70b073462
Merge: 109444a 93eddea
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 ae598ed8b59d62dc887a78b29fb3148125f88651
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

 run_tests.sh |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

commit 109444a5f3693af1f439bdcf1c27cf54c22436c9
Merge: 187c194 17a04e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 30 15:09:03 2011 +0000

    Merge "bug 861310"

commit f51864ef1971d17bf1fb0208b4ca6348715d7e56
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

commit 4edb32a6ba8dd6c63a6821dd4850788dfd046432
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

commit 7f2a043986efb874f20699379711bc1102e933d1
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

commit 187c194929cf27d941871eb914e21ae109e809df
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 files changed, 1 insertions(+), 1 deletions(-)

commit f0ecede5c4bd06d8f52439a80fe8ea9f003a3a63
Merge: e2fa93b c4815ec
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 e2fa93bb251c7389ee6964db88fd4e270a57fa1f
Merge: 19f8489 1c8c3d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:57:19 2011 +0000

    Merge "Change 'recurse_zones' to 'local_zone_only'."

commit 19f8489c46e39a8b84dda5630623999b8488d8c4
Merge: be52ffc e744e23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:47:57 2011 +0000

    Merge "bug lp845714"

commit be52ffc9699d131188880d9818888e36cedf774e
Merge: 1ff21d7 c041c79
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 29 16:18:17 2011 +0000

    Merge "Enforce snapshot cleanup."

commit e744e23a11f55efe48624b53a82251faa6cb254e
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

commit c041c794daa84631e556d8597c2f3fe2320de1ae
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 17a04e708498063acd37aa300ed7a9816c38307e
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

commit 1c8c3d17523c89d3847b9dcf7e3d09a0a8abfba8
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

commit c4815ecdaf5ae110b99f93f8b27da95e73da8f44
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

commit 1ff21d71122a7746403b5b68654ed98a4350066b
Merge: ab94322 0a8046a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 20:51:38 2011 +0000

    Merge "Fixes a test failure in master"

commit 0a8046ac141fe80225690ae1956843de5e187fb7
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

commit 93eddea7a3f5af5cf8a114766667f18992bad793
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

commit ab94322da4d11a04420608e7c5f23cdd06055cb9
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

commit 57d187653379c4e1958546c920ab6d414410f9fa
Merge: f3904b4 f958ab7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 17:26:26 2011 +0000

    Merge "Accept message as sole argument to NovaException"

commit f3904b409db7f68860663dab71cf9198e49ad857
Merge: bdb0619 38ed0b6
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 bdb0619a2fbf564802a085c3079db91e3d2fdde5
Merge: c27eb00 838e1c1
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 f958ab79e23c5ad323238aaabde58e405f1fb5de
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

commit 38ed0b68f9d702f1a06656d6be7448ec310adccc
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

commit 838e1c15d658e76313ebe4e1590fce7649d8e424
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c27eb00f30e06e1dd6b55d28a61182cba28b9b53
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

commit 636ee2a8f69a45b66d86c01b0bc2711cedacb49f
Merge: d95c9a3 c61de46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 20:01:30 2011 +0000

    Merge "compute_api create*() and schedulers refactoring"

commit d95c9a31274d75632bb2161569e0846705819226
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

commit 7541cf41929a3ffd6a95694e0727f149f5db574d
Merge: c26ab4d d93fc15
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 c26ab4d057f9e6a752cff0f99d6a4875e89fee31
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 a9890bb4f3db027abb1b70c6463f3b0f670c2e79
Author: Dan Prince <dan.prince@rackspace.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

commit c61de46a7221a91255b5d9fc207604e16ff30b8b
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

commit 539ea589ad275945980ecc22e8e832eb0296cf0d
Merge: 953c611 08c9dd6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 27 05:05:35 2011 +0000

    Merge "Adds disk config"

commit 953c611d464fef8d9752cdc89652c684361210e2
Merge: 62b4b57 60991d3
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 d93fc15bd6de291b90c6f7fb916724b56ea16166
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

commit 62b4b57067e25a08d0e4930eb56c2f60e883fc95
Merge: 8b98eaa af7eee0
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 8b98eaa68b9c2394ba73649826483c50bd1b16d1
Merge: 4699db7 3f1c23f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 18:47:56 2011 +0000

    Merge "Ensure minRam and minDisk are always integers"

commit 4699db78ec281e5e252d46f4f0d6162662234896
Merge: 66a7a35 46a496c
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 3f1c23f71b89a13d245527eaf028e5b146261831
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

commit af7eee0cfc483b8f268af42181efdf6e2c37786d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Sep 26 13:39:14 2011 -0400

    Call endheaders when auth_token is None. Fixes bug 856721.
    
    Change-Id: I2be932d3c532a7be03a0e5296e592e681c05b75d

commit 66a7a3551ec64dfd1f4a4cd04b69833a75c1b69a
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

commit 4705ceced7e7af8800777fce2e231b7d90a59be3
Merge: 6139d43 7a30924
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 26 15:55:49 2011 +0000

    Merge "Add next links to images requests"

commit 6139d4355a88ca02a654e8f19eeca522157570c7
Merge: a98d088 d913c40
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 7a30924dc26c0fbd0364c24f84516c21f2719cb9
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

commit 46a496c5416fc4b7361430b7da7b82a05f78ffd1
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

commit a98d08892b869be48add8ffcb00b180c39d35710
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

commit d913c4088c5c492dd42823e2e007c168cd44802e
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

commit 60991d354846fdb6f127c1660be6f31a0dc9ebec
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

commit 8c47895133d5f43deb6d4585624cc7557fede5a3
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

commit 920127b79a1056357deb80b4f643f41eeff6c242
Merge: 69f65f9 686309e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 21:55:51 2011 +0000

    Merge "Made jenkins email pruning more resilient."

commit 686309ef2b69b860231184939821aafe11e40d42
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Sep 23 17:37:29 2011 -0400

    Made jenkins email pruning more resilient.
    
    Change-Id: I812e95fb0744ad84abd7ea2ad7d11123667abbc8

commit 69f65f99a83c3321be1a761908f824b5183fdaf7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 23 16:39:21 2011 -0400

    Fixing bug 857712
    
    Change-Id: I495363b44d9da96d66f85c2a621393329830aeb3

commit 08c9dd67a82b893d6dc1c45dfb7cb3e509d12d6f
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Sep 23 15:36:50 2011 -0500

    Adds disk config
    
    Change-Id: If3e1765b659ead77f9cdaaa86ee8478a82bf67c0

commit 9acb4b665f6fbb0a5b5fa938487caeaa99e5ac46
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

commit 01c90da1320b6f78d2a7176f9b706003423ca36a
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 9189bf1e086eded65af9ecbe61f6b2c28948ba11
Merge: f5b9b0b 8dd2717
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 23 17:38:21 2011 +0000

    Merge "Don't use GitPython for authors check"

commit 8dd2717fe9e94c2be925ba0dd2393eaa991a0a74
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

 tools/pip-requires |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit f5b9b0b8461059f261d9021e7775c25abe3b2c78
Merge: 6b1396a c29f98f
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 6b1396a5b7d82afc643e1959548061c1570d4e08
Merge: 701272f fe13444
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 701272f92fc060c82a742e4b7a68eb46ff0ce5d4
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

 run_tests.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

commit fe134445bcde46b4cd66744b0c32345aeadd89a6
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

commit c29f98fe6b8bccfe3de69db5eb66456f7f8567a4
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 files changed, 2 insertions(+), 2 deletions(-)

commit bc192b9f39537a880b1cc1b1c35f78d0ff1f590f
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 deletions(-)

commit eb45e26e6fa820265dbff3c1930d412c2fd514ee
Merge: bb2f26d 91c93a3
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 bb2f26dd3b6be060a286f5fd1d84995acb618de1
Merge: f9b2051 1763826
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 f9b2051586f5de45e64709fd6d5d789578e1ced0
Merge: 20e1c09 9fb3449
Author: Dan Prince <dan.prince@rackspace.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 91c93a39d1bf63ca0996cc03c7eb5162c8880fda
Merge: 04f6809 20e1c09
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:50:02 2011 -0500

    Merging trunk

commit 04f68094c30af8f67a0dad63751229c5644ecbfc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:49:35 2011 -0500

    Adding OSAPI tests for flavor filtering

commit 20e1c09f6082f6dee8931bb2ee0ee1f7752a320b
Merge: aeca2ac f2d0e4a
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 7d7423adc90695bed3a4e61b530c3ee396d730e9
Merge: b18b9cd aeca2ac
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:07:56 2011 -0500

    Merging trunk

commit aeca2acb00173d016bedbf7a2b9c9afd7365160c
Merge: f8a5566 a258ea7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 21:31:32 2011 +0000

    Fixes lp:855115 -- issue with disassociating floating ips.

commit f2d0e4a41ab9d86a1b1cdb20f2ed6e4d8fbe3107
Merge: 201a2b9 f8a5566
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:00:53 2011 -0500

    Renumbering instance progress migration

commit 201a2b9776f2f11f3f49e8f69a60644485197e65
Merge: 3358545 e9ccadb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 15:59:40 2011 -0500

    Fixing tests

commit f8a556643c8eb76ed54dd7e3b19669885397ad3f
Merge: e9ccadb c0603f1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 20:52:18 2011 +0000

    Keystone support in Nova across Zones.

commit c0603f116fcdbf7d21146bd1a179eb0635435b0c
Merge: 1012520 e9ccadb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 13:17:05 2011 -0700

    trunk merge fixup

commit e9ccadb9803892ea32fd338b38ef558451d22d3b
Merge: de8f18c d470852
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 de8f18cd6568a3f686153fae12a3bc87631d26b6
Merge: 024233a 11b751b
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 b18b9cd8af570348576f79a6e2f419d64b83341d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 17:04:38 2011 +0000

    Typo

commit b3c9c7ac5f11fd351db3870fa8bfbe03bc942deb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:58:19 2011 +0000

    Fixing tests

commit 6df17a7302cea35a2d4d567213cda782aec73a6b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:43:45 2011 +0000

    Fixing tests

commit d47085259f40e2ba9dd5abcf4323d58d0dbc1658
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 09:34:59 2011 -0700

    make sure kwargs are strings and not unicode

commit 62e90a689c2121a90a37555e0b8cbb4feeb5dd23
Merge: ed0627f 024233a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:30:30 2011 +0000

    Merging trunk

commit ed0627febcc7231e4092dbb444d48bb56cc96407
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 16:29:36 2011 +0000

    Adding flavor filtering

commit 024233a141c8955cc9e8c522de1a6e93c1e594ae
Merge: f02b127 460ff7b
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 f02b1275f4a26eff803abef2b886dd7748e75ebd
Merge: 74189e6 63b269b
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 63b269becc120ff1b7a3be58c7735d1bd093f6db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 05:56:48 2011 -0700

    pep8

commit a511b706f1104f09cfe4320a72c60bf47de9a7ca
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

commit 10125205b5675fd466e8f73710cbba15a8e337c5
Merge: b97cf19 7d26edb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:19:53 2011 -0700

    fix diverged branch

commit b97cf198cf06594e95f8df4d08e9d9fb16e9e8a3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:07:17 2011 -0700

    migration conflict fixed

commit f351aff1cf0b3c024dc36c14959dc5d6208a4bbe
Merge: 1b84d2c 74189e6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:04:37 2011 -0700

    clean up based on cerberus review

commit 1b84d2cb552ef75925b41f6c569201a01d24aab4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 21 05:03:37 2011 -0700

    clean up based on cerberus review

commit 74189e6939b79249a844b289444bc11a1a0a97e2
Merge: d790d71 b5c2db9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 10:47:07 2011 +0000

    Remove keystone middlewares.

commit 0a63694d32dc8fe8a4fc770f20a08ec5e0ca6233
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 02:09:37 2011 -0700

    fix moving of ips on flatdhcp bridge

commit a258ea76e7508e64c40d2a1ac95ed805cb685b09
Merge: 49a23c0 e9ccadb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 09:00:18 2011 +0000

    Merged trunk

commit 6377ec46255c0efc88f385f678725ccf4f5ea2af
Merge: f6f83e5 d6b180e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 21 02:00:07 2011 -0700

    merged trunk

commit 49a23c08f5b2dc5e5703d4c64acd39a31ad8cf87
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 21 08:47:33 2011 +0000

    update floating ips tests

commit 732abe4eb797ed85d8925c84bd71a22f8ce5c6cc
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

commit 037c86ceb81d9c1b11c5524aca77443d41a76e58
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.

commit 1b7304c91cfbea9c66d14bb2cf890afbdec5fa52
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

commit f368c1c0ce8d324a3effbaaee2cf12d73f9c911e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:55:28 2011 +0000

    Pep8 fixes

commit 21309066139f0e3cee7aa8ea01e56ab144e1c33f
Merge: c97d7bd d790d71
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:33:55 2011 +0000

    Merging trunk

commit c97d7bda4c8434ffdd0865ca91ff674430eb774d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 21 03:33:31 2011 +0000

    Refactoring instance_type_get_all

commit b5c2db9528d26df69d603a8d5ccb9e652a2b0d18
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:52:03 2011 -0700

    remove keystone url flag

commit 5770f510bf30ec6eaea7ce9da4fdb3355ef9b51d
Merge: 77a9a49 d6b180e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:37:41 2011 -0700

    merge trunk, fix conflicts

commit 77a9a49eb8fec50694867512cff52971b6526ed4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 15:17:03 2011 -0700

    remove keystone

commit 11b751b37d585c970f23135569719a301857b322
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 16:11:49 2011 -0500

    Include 'type' in XML output.

commit d6d48ad08e492206709d9d359a39a7d9d8640404
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:38:44 2011 -0500

    Minor cleanup.

commit 8989a9fe9c07b9038fbbe24a2a8933501aa7418a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:35:23 2011 -0500

    Added another unit test.

commit e3a90a7967adbaea455a1fb54b800eca331801b9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 15:21:06 2011 -0500

    Fixed unit tests with some minor refactoring.

commit d790d71b6ded4b185880ce3d774fd9a1dc29fc2b
Merge: d6b180e 43b6d9c
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 fd99e41ea695ac010484b26d77d62ccf7d904fea
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 20 13:56:15 2011 -0500

    Refactored alternate link generation.

commit 1763826795eff6ab65b9da29b17b1682b6580480
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Sep 20 14:43:50 2011 -0400

    pep8 fixes

commit 4c4dd6c71c4123c29836bf9c12d3795d1d41c21c
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.

commit 12fad2be9d3420784d402600df0ed0ba261cea88
Merge: f512c54 d6b180e
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Sep 20 09:22:25 2011 -0400

    merge from trunk

commit d6b180ea1924e6f99e079602c615a9314aeb37f9
Merge: df62880 e158efc
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 43b6d9c3790d0cb01222a3a10f74ef99269656fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 20 02:55:56 2011 -0700

    show swap in Mb in nova manage

commit e158efc135aad1a6d1d343eb28cdf5e7aaad6523
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)

commit df628803d5e2a2513ce8ab508bdf814816697991
Merge: bf0db4a 9ba9a2e
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 bf0db4a72264ac061c5a043b31791284a9392951
Merge: e156a8c 7296a94
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 28b91da8463d941bb44c1a222501e3c5c880ff46
Merge: a4f3bcd e156a8c
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 03:23:34 2011 -0400

    merge with trunk r1601

commit a4f3bcd64ee67e9879ec1094967dc327deb308c0
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 20 03:18:45 2011 -0400

    fix call to gettext

commit e156a8c8761d66acf44b7f2403b6f2da374cc77a
Merge: bc479c9 5f30b6b
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 bc479c94c90fadffb9213d88cdd2d2706b4035b2
Merge: f4ccb18 5b7ab47
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 f4ccb18bd92832a5f35b8f003e7b4478369b43c2
Merge: dfbb0a4 8be01a0
Author: Dan Prince <dan.prince@rackspace.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 5f30b6bdbed5494d627bcc4c9c501503f4fe1bb1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 3eae0777008ec9b423dcccd34f2de80f30cbb715
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"

commit f512c5492677e9806154b562e583cc3d0d275342
Merge: dabbd54 dfbb0a4
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 22:09:53 2011 -0400

    merged with trunk

commit 8be01a0e2211b1b89362d1e44d91eb153cda5342
Author: Dan Prince <dan.prince@rackspace.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.

commit dabbd54095a577d8074e46a0781d666c9fea3c7b
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 21:53:21 2011 -0400

    oops, add project_id and 'servers' to next links

commit dfbb0a4306f68da931942c63f9635cdbb9b09239
Merge: 8f7db1a 9750954
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 8f7db1af93ae76c1d7d34daaf096c592230423e7
Merge: 694fa8d da18882
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 ba751ae84636bbb4d5db9468c12acb549a51aa2e
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 20:39:02 2011 -0400

    fix syntax error in exception, remove "Dangerous!" comment

commit da188824fe56ab6a28d4c0c0137860e50b3124da
Merge: 1606007 694fa8d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:32:45 2011 -0700

    merged trunk and resolved conflict

commit 9750954595ae9fe4148db5eadd145b3df60e5824
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 17:27:25 2011 -0500

    run the alter on the right table

commit 16060071a3f659125488f8913397da392b495d49
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:23:52 2011 -0700

    fix unrelated pep8 issue in trunk

commit d9246d7ec1f11219cda9af13704ec06c333721ba
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 18:13:08 2011 -0400

    use dictionary format for exception message

commit 3c6ac7c83ba8c188ef0ff3766cc4ae373127dd0e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Sep 19 15:08:25 2011 -0700

    fix a test where list order was assumed

commit 6f0ea8a5cef477dc19bf5d5a0a53a37376903a06
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.

commit 694fa8d93986be94c59f538e2fbbfe4d6de7c5ec
Merge: 765206e 93519fd
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 765206ea2de835838e0ea5b8943b674663c17c24
Merge: e02432e caddac7
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 c9f1b4dfc7659884e4cf4453377dd0628b68a9c4
Author: Scott Moser <smoser@ubuntu.com>
Date:   Mon Sep 19 17:10:48 2011 -0400

    use '_(' for exception messages

commit caddac71332328eeef36f2b698b02e5136c5bf58
Merge: 71bf23d e02432e
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 16:02:29 2011 -0500

    PEP8 cleanup.

commit 91cfb28e147c4bd42a03fb5ad9172585f5d774f5
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.

commit 5b7ab47148abdf40fb54fee8b25b82717a80773a
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

commit e02432e03b1ba62616fae714f82cf25c68e482b6
Merge: 5855f37 ee1bc6d
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 5855f3700583d1aae83d68f336ff28a335deb56b
Merge: c6da0f7 4b61ed6
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 50091eef90d4beb4cff4ed17ea6164a26608d6a6
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 16:03:31 2011 -0400

    remove urllib import

commit c6da0f749dc08b2219461e1abf06a2d4c886ea87
Merge: 5547889 024308f
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 5547889ef68cda8bd9a747046bd0a14f71726ac4
Merge: 82d8935 f137404
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 3358545d6dff76b43c61c248c72d71cfaf6e32b1
Merge: e40dfa3 82d8935
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Sep 19 19:32:33 2011 +0000

    Merging trunk

commit e40dfa3c1427c9254958807ddd2e2a044b59eee3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Sep 19 19:32:09 2011 +0000

    Renaming progress migration to 47

commit 191c82bac0be8903fb9fe3eced8e03de29f98ffe
Merge: b0ed4b6 82d8935
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 14:07:14 2011 -0400

    merge with trunk

commit 71bf23d3a221899bd41544092fdf52b956d4c603
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 11:58:20 2011 -0500

    Added unit test.

commit deba5322670e20ddea4c39b4884c7c5cc51695cc
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 11:10:50 2011 -0500

    Corrected the status in DB call.

commit f1374048c7095a8ecca3299b0158b51d004a5676
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

commit b0ed4b691b14f085d44b68015a1b018362363f3c
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

commit b3adbd7a7403408e6dc08677d621a5e3c0dd9ab6
Merge: 41456e9 82d8935
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Sep 19 10:25:00 2011 -0500

    Merged trunk.

commit ee1bc6d9acdfaad624b149f616a1cc16dd306888
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:50:13 2011 -0500

    remove unused import

commit cb30df927f31a5fbca7b00200e89a3c93d8f37a1
Merge: 2536200 82d8935
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:35:08 2011 -0500

    merge the sknurt

commit 253620006ca0d41fba8bf7eac16e493d49c839c8
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:34:19 2011 -0500

    remove the polymorph

commit c6e8752ca076809d8949c073aa9997f6c1a06b09
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Sep 19 09:33:47 2011 -0500

    Fix typo in comment

commit 82d89352bbc56f5fb2c2674f79afaac00530f8c5
Merge: 5645cf1 0be8444
Author: Thuleau Édouard <thuleau@gmail.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 8462ff57ef68b464e8d910d4b7c359aef20c1a01
Merge: 191bf20 5645cf1
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Sep 19 09:25:02 2011 -0400

    merge with trunk

commit 024308f2b980fcc224583561d17006995c505dcd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Sep 18 17:01:44 2011 -0400

    removing extra newline

commit 2d338168a0920f2f278c19a60051dad84213146c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Sep 18 16:01:28 2011 -0400

    catching AttributeError and adding tests

commit 5645cf14767cdc4c1c7b15874e9e22e731975586
Merge: 3b7ccad 51e8259
Author: Jason Koelker <jason@koelker.net>
Date:   Sun Sep 18 19:36:16 2011 +0000

    Remove vestigial db call for fixed_ips.

commit 3b7ccad21e3b6cf4b022abb3e76d1f51febcebbf
Merge: b4859ac fb51fce
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 b4859ac63425088505c698cddafd2be4a0ce2ae4
Merge: 965c2e3 b2ece5a
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 4b61ed61af9b4120264845005eb5a1ae7dcfc736
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 18 02:37:09 2011 -0700

    remove extra line

commit 0b5269b71a895354e72625c4dcc92e99192a8c6d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 17 15:26:31 2011 -0700

    get the interface using the network and instance

commit 2de22110ee2f8aed2e259ada29e7357f913df63d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 17 15:09:36 2011 -0700

    flag typo

commit ffbe976bfd1e8d08c444dac824817be702e9ef37
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

commit fb51fce19017da7f21eb9f341bbdee46657a5031
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

commit 965c2e39c8f1a99a6c30ae05d6a94d6778a212d1
Merge: b53bbdd 19fd73d
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 b53bbdddc622155106d53e080dadf006aac00243
Merge: 2a2443d 3a71083
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 9ba9a2e996e5ed53267da1cdbb7be3caf1d6c7a3
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sat Sep 17 08:28:16 2011 +0100

    Fix pep8 issues

commit ed6b849843ac6ff78d7dc9e22b4034b465131b1a
Merge: 1decd40 2a2443d
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 93519fd7dbac1608a44d1d1c2b52c5417488459e
Author: paul@openstack.org <>
Date:   Fri Sep 16 21:12:50 2011 -0500

    fixed grant user, added stdout support

commit 2a2443da9974f5ccd4bc709744e19c0258a3d3b5
Merge: 73854da 2cbdc2e
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 f727b312ad71e6a6de57b936cf552cc70da78308
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 20:07:38 2011 +0000

    Fixing list prepend

commit 5f8b77fdc8da6bf2094fecba2698894bdff51b0d
Merge: 83fda5a 73854da
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 19:45:46 2011 +0000

    Merging trunk

commit 7296a94de46763ff1dfe96c9e7089be24a3d9e86
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.

commit 19fd73d8069e074180858304c0a33a75cde75a27
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 21:27:25 2011 +0200

    Fix failing test.

commit 73854da120f6173d4a5a5c8252de8c617d0fda21
Merge: 6aa1c1a e669fcc
Author: Thuleau Édouard <thuleau@gmail.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 6aa1c1ab13fd53c366fd2e0fabcfe45b2a1c78ab
Merge: 21aa35b f1e3767
Author: Dan Prince <dan.prince@rackspace.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 51e8259646f15b934f79d5c8149bc7cf1175a54e
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:52:06 2011 -0500

    pep8

commit 627c237edb0a9c006b03e818f911bf3c261b21fa
Merge: 40e29aa 21aa35b
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:48:52 2011 -0500

    merge the trunks

commit e5bb60e100410b84729060582af1757ab34ced4a
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

commit 16f3f2034db07c24a2bef0b79610b9dee1940123
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:43:31 2011 -0500

    make sure to raise since the tests require it

commit 83fda5a051ade2d6fff2f5f7a2588633f37846dc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:37:53 2011 +0000

    Pep8 Fix

commit f1e3767d0350e0085118161cf2de1ec4d9818054
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Sep 16 14:35:10 2011 -0400

    Update test_volumes to use FLAGS.password_length.

commit 2ee9d3a0e51b7677ae9c8275d5526449409a51ca
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:34:21 2011 +0000

    Zero out the progress when beginning a resize

commit 3773fd04c01a8cd9653dfdb33c365a05f6f39d45
Merge: 8b57e39 21aa35b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Sep 16 14:30:40 2011 -0400

    Merge w/ trunk.

commit 254080bfa8abb547e34a5b3515621eb2204ec748
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 18:06:27 2011 +0000

    Adding migration progress

commit 41456e999c1f09b54a2b24a208bf21193a4c574b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 16 13:06:21 2011 -0500

    Only log migration info if they exist.

commit 9e2bc408a7599a5e02324e24180c0c9551a54e87
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 13:02:13 2011 -0500

    remove getting fixed_ips directly from the db

commit 7d26edba7a5abbd1cc9bb61e3060ff2b78392f41
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 16 14:54:21 2011 -0300

    removed unused import

commit 21aa35b84eb326591dd045b4df54c8e7f15f9810
Merge: 7f61a59 b6bf3fb
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 a0dae485ddf8e665978971de8b7a4d937b079199
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 11:17:44 2011 -0500

    Fixing tests, PEP8 failures

commit b6bf3fbff8004b44681735febe586508b8273bee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 16 08:44:25 2011 -0700

    fix permissions

commit 7f61a590b710cb84571eda0d86be41dc75560fec
Merge: 05e4bc9 a111124
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Sep 16 15:36:57 2011 +0000

    Add a FakeVirDomainSnapshot and return it from snapshotCreateXML.
    Fixes libvirt snapshot tests.

commit 40e29aa0ba357c3b2f7954298d6359042da6f069
Merge: 0652505 05e4bc9
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Sep 16 10:28:54 2011 -0500

    merge the trunks

commit 75d9680a7adee0c96098dba0de5943998d678fee
Merge: ec58bca 05e4bc9
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 16 10:25:53 2011 -0500

    Merged trunk.

commit 05e4bc954bc80881c1ec396cef71b8696984ffb6
Merge: 2e59ba0 bf03b65
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 52f3d9dd361ddcc3091414b36873283a8b7235d3
Merge: 50b6f0c 2e59ba0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 17:17:34 2011 +0200

    Merge trunk

commit bf03b65a817ed9c36625b0d43e9a9c8fb77a54c4
Merge: 553266d 2e59ba0
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 16 07:40:37 2011 -0700

    Removed sudo from the arguments

commit a11112455d0c6cfc3ead6bdbd3d9d18aeb1e6b23
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Sep 16 09:40:24 2011 -0400

    Add a FakeVirDomainSnapshot and return it from snapshotCreateXML.
    Fixes libvirt snapshot tests.

commit 191bf20a18c681b597929f35d52abfb19eca9c98
Merge: 9b95c3a 2e59ba0
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Sep 16 09:28:51 2011 -0400

    merge from trunk

commit 50b6f0ce89adfcab7f320ac82cdc7b5d6f64ab84
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 16 14:28:57 2011 +0200

    Make sure grantee_group is eagerly loaded.

commit e669fcc61e0711452a76a9ae327c413972c32243
Merge: 913deed 2e59ba0
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 16 11:20:38 2011 +0200

    Merged trunk.

commit 3a71083ae4fd3df38d0de57f47df60fd70259d28
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.

commit 9fb3449dedd8bc5c3cadb59cacb84a6c7e87ba82
Author: Dan Prince <dan.prince@rackspace.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.

commit 2e59ba007c760a9b781e5379dc6ff3a1d69c24bd
Merge: b67f18c df8dab4
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 854a2f5fe557af8babd519f43ebc52c0b7b7228c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 18:20:35 2011 -0700

    cleaned up

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 274dc48250b183942ff301932f0940b5d2a61ead
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 18:10:04 2011 -0700

    remove debugging

commit e0cccf51fb3a5abfb3daf803364c598b4cee202e
Merge: a72b594 e07b9c8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 00:25:39 2011 +0000

    Merging trunk

commit a72b594d021a14356adfdec6d943187a91624c0e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Sep 16 00:22:31 2011 +0000

    Allowing resizes to the same machine

commit 47147a4bb9731161efc8597607ce78bf8ed62a71
Merge: 0140d39 b67f18c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 16:52:58 2011 -0700

    trunk merge

commit b67f18c2afb503274a731ca79f2a5f3437c1d0a0
Merge: a2b21b2 c80db3a
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 c80db3a1612e004b8ecd350b34c2877601789de0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 15 16:58:22 2011 -0500

    NoMoreFixedIps now subclasses NovaException instead of Error

commit 06525058dbb0c5a720fb3de5684d0077e3a4b7ab
Merge: 6273b04 a2b21b2
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 16:46:08 2011 -0500

    merge trunk

commit 6273b04603cde659c39d50962314a6f1aba5fe13
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

commit 10a822771feb5d712d36506881eb99a94130d40d
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 16:20:13 2011 -0500

    pep8

commit 83f7919aa449446b4a0bd8c7e38cd1f88e16e9e4
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

commit 0140d399e2737d7499e105ceef6cdcb585f6a8b0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 13:42:30 2011 -0700

    tests working again

commit e7439e8cb948f9243d2d08c3f245033814c5b704
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

commit c91008cb679cf18e6d4466eba0984a337cdcb14a
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:20:05 2011 -0500

    uhh dialect doesn't exist, beavis

commit 54251e705c7315816dd476b86f44f8524772cfec
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 15:07:49 2011 -0500

    update comment

commit a2b21b2a6c717d997cd6021b357744403008ff05
Merge: e46341f b415a45
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 c2a5f8884c03ed0c7e5d7d3281a6a1866fbfacb1
Merge: f2554a5 e46341f
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 89626f737b30d113f7f2cbbaa9ce63e872f616db
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 13:00:21 2011 -0700

    exceptions properly passed around now

commit 2cbdc2e2dbc50d341197a6827161d234142a2b3e
Merge: d3bc307 94beed3
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 15 15:49:47 2011 -0400

    merge with trunk at revno 1573

commit f2554a5becaca41922ecf184b5636a1f6d06b62b
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:41:53 2011 -0500

    add the fake_network Manager to prevent rpc calls

commit e46341fda79cf8bcfa7ad6278faf916b49cf5c92
Merge: 161e0e8 e466843
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 a37fce0c911b553d4789190eb47a1b2226d4d17f
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:25:52 2011 -0500

    remove undedded imports and skips

commit 9b95c3a03a19ce0de59a64cf60848bb2410214b6
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 15:18:25 2011 -0400

    pep8 fixes

commit ec58bca2955fac97117e2cf372a56a4e19dda45a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 14:09:14 2011 -0500

    Added a unit test.

commit 4aec771c57af85cbd194446b7d458b5753441c93
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

commit 81d686f10e5627f2264295f8169dfdd09ea84bb6
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 14:02:24 2011 -0500

    update for the id->uuid flip

commit a4c7ac39508838ce59f7b18ea7cf55a2ac73a8e7
Merge: fed4a76 161e0e8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 14:00:19 2011 -0500

    Merged trunk.

commit 161e0e8477bded9e6fc33c5d2034799593bc8cb4
Merge: d3bc307 9d0b930
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 15 18:57:35 2011 +0000

    Adding flavor extra data extension.

commit fed4a76fa60629d20546eb9386d25ea7bd569a23
Merge: dd8ac97 d3bc307
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 13:56:45 2011 -0500

    Merged trunk.

commit b9f536addecb2427c115ff848ae6223e0465f8b1
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:47:26 2011 -0500

    fix test

commit 34230797c0da5bcc698562ad132b7f59c0a1fc43
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:47:16 2011 -0500

    revert last change

commit dd8ac97509c16bfb08ed69a42b64916bfe7449fa
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 13:44:49 2011 -0500

    Added virt-level support for polling unconfirmed resizes.

commit eef001fbaa7b9e0567f85352db7b7d7966178dda
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:44:29 2011 -0500

    build the query with the query builder

commit d3bc30735837cc2ca4d515a1b19606455015417c
Merge: 70caf47 fb187d5
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 310310c2480244eef2640f54936d22b2a6daea01
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:31:15 2011 -0500

    use uuids everywhere possible

commit ea320d488a81eaa8c2b7b386180a04f43176d962
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:30:38 2011 -0500

    make sure to use the uuid

commit 083eb8f66b927b439d917bf56f711dd3c28e784f
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:30:17 2011 -0500

    update db api for split filterings searches

commit c6c0c3fd5e3f2788880e0536c107eddebdf4003c
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Sep 15 13:29:37 2011 -0500

    update tests

commit df8dab48acc6453c5b3c35796e5c9735ae98009e
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

commit e46684309e98bbdc7cb69488571748b9f408c988
Merge: 0f0a5b1 70caf47
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Thu Sep 15 11:10:33 2011 -0700

    Merge trunk.

commit 1474e09130c1fad7f4844e15499ad7b453a58ad7
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:10:26 2011 -0400

    cleanup prints in tests

commit 8cbe8453be25d59c2e852219492dd9c7f37c090d
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:09:00 2011 -0400

    cleanup prints in tests

commit 0f0a5b1c57b16602f8296e87a5f42c127599b843
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.

commit 232cd5377aafc0e362031764354a2b5cb6a70e79
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 14:04:50 2011 -0400

    get rid of debugs

commit 553266d9a332a6026d4a30865dbe51fb7612e9f3
Merge: 21c9ce4 70caf47
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 15 10:43:42 2011 -0700

    Merged from trunk and resolved conflicts

commit 21c9ce49c1f8534fd0dcb1348a98a410c55ce032
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

commit b8aca8c89e9bbbe7b4ac89628a431872d9ba5d69
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.

commit f97523fad92bff8a2734b3dc3c10246f08f344ab
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 11:52:12 2011 -0400

    pep8 issues

commit 2bed3d9f7807f3b77f81cea154ec5260753c1f64
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

commit 8b40e4c887560ca35ab9cff4a24ab4820b9a64e5
Merge: d08c2eb 70caf47
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 15 10:08:04 2011 -0500

    Merged trunk.

commit c3dd02fefcedc6278f8c2586e06087aa434a0f99
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Sep 15 10:21:33 2011 -0400

    added servers_links in v1.1 with tests

commit 460ff7badb190103f5380f482a0748c5c37ddab6
Merge: 3a3c7cf 70caf47
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 15 14:21:26 2011 +0000

    Merge with trunk

commit 8b57e39d9850b322b74f5741e53572483957dde4
Merge: 19584d9 86baca6
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Sep 15 10:07:58 2011 -0400

    Merge w/ trunk.

commit b03f0ada8e7e055b11c2d3259dd7e31b04bafa68
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

commit 70caf47fd573335466c61e22f6b11fb7cfdc7375
Merge: 86baca6 35821d1
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 a2defe6cde66cae3fe28a424b816ee12de16e39f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 15 04:54:01 2011 -0700

    pep8

commit 9d610232ca135bb0f837f101aad14cc880174fec
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Sep 14 19:55:51 2011 -0700

    tests are back

commit e07b9c89741e89989c25cb140011147114de50f5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 18:22:39 2011 -0500

    PEP8 fix

commit 4df05f09640b7e38805cb57613e2a0feedd9b35e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 23:11:03 2011 +0000

    Adding progress

commit 3a3c7cf960ab989949dfbf0f6ec41472b9ea88f7
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

commit 193b34260ecabf75d58d4e8aeae6c2784b4fd0f9
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 17:36:19 2011 -0500

    0 for the instance id is False ;)

commit a32e7d3ac1cf664953f30f72c8e6b924bf48a6df
Merge: ee66f68 86baca6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 22:33:58 2011 +0000

    Merge with trunk

commit ee66f68b85d4f2db71d03b727400d822fee1e085
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

commit e7a21dc1e7778bf513f747a226a6adcee97f1b46
Merge: 5846c1b 86baca6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 15:30:27 2011 -0700

    merge trunk

commit 5846c1bdc57438a406055a9f59d99368f3ca0bfd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 15:28:22 2011 -0700

    write out xml for rescue

commit bc02fffa38f0bda8908f5ae836d5b569d1472405
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

commit 56e270962bb6de67f0aa44009359588d9dfbd175
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

commit 43caf53f1b8112e92b97a18ec409423501b83dd5
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 16:13:59 2011 -0500

    make sure to pass in the context

commit 92b70406543df21d5d850151f990140964231b90
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:59:12 2011 -0500

    move the FakeNetworkManager into fake_network

commit 86baca6f5676fa56e518aaa929ba88a59bc73867
Merge: 3c38299 6606d2f
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 4b6182bd713e997d6ce1e3946768754a0cdd9199
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:49:10 2011 -0500

    ip tests were moved to networking

commit a9ce40a6ac1e3d46470ccf9de06e744d51d9374f
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:47:41 2011 -0500

    add tests

commit 3b08b1485f538e800ec772929b0a79885250633c
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 15:23:53 2011 -0500

    fix typo

commit 58a6db3f24c852cc16214510a2eb76d225e9127c
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

commit 566a57f9f3cfcfa19b290f9cb17e70bb373938ad
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

commit a5b31f50b766b387a3619f79f4910a659ecfff7b
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:52:56 2011 -0500

    fix typo

commit d08c2eb5f68b42c2dc59d438916da4a2da738840
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.

commit e10d11f2a7d0224adb23a7ee86bbad33248a1d0b
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Wed Sep 14 12:33:51 2011 -0700

    Use the correct method to get a builder.

commit 7435e4d3b4d86524467c42914d164f3a98813fad
Merge: 0f7f186 3c38299
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:13:54 2011 -0500

    merge trunks

commit 0f7f18609518bebea00db6b62f53bab69c31d88d
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:13:26 2011 -0500

    pep8

commit e870b78b16461dfa75bd46ff68a63d6e1bf8a724
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 14:02:54 2011 -0500

    move ip filtering over to the network side

commit 9d0b930a3f82e9ffac065b4b385c6215d23cceaa
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:58:47 2011 -0400

    fix pep8 whitespace error

commit 4da11f5d49b5663fe71b16897a2eb87b01a02cb9
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:51:55 2011 -0400

    add necessary fields to flavor.rng schema

commit f41537f284351e465a78d5a942db80910722904b
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:47:35 2011 -0500

    get all the vifs

commit 11d63097e893a0029dff1b7580776ef6dd9798c1
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:47:11 2011 -0500

    get all the vifs

commit 549fdf4cdba26678113133a752e2a6ae0994cf04
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 13:46:09 2011 -0500

    make sure we are grabbing out just the ids

commit 8f18c358217fd605b8a743f13404c15f2c18fe7c
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 14:37:32 2011 -0400

    flavor_elem.setAttribute -> flavor_elem.set, flavor -> flavor_dict

commit 2b92078b4626a36a835540e506cf5988b9a70a70
Author: paul@openstack.org <>
Date:   Wed Sep 14 13:20:16 2011 -0500

    minor changes to credentials for the correct format

commit 35821d18801335e1078a77f5c4c4e91dc82752d1
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

commit 06f686f2fe206492ba929afe08923a4f4f92b1ee
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

commit 2c1025487da7de28a4059c06e6d863bfd5a7aec1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:44:22 2011 +0000

    Test both content types for JSON and XML

commit 404ef6309de18d3bdef1e1d352c92cdd18162615
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

commit 2f97f7170920006198a533d9c1f4d3988fc4e3da
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 17:29:28 2011 +0000

    Add copyright

commit a53f90e000d8057ac65946f01bd0d713dc503992
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

commit 842a924c4ae8aeb3aed8c1376451e94ced52e8ab
Author: paul@openstack.org <>
Date:   Wed Sep 14 12:10:33 2011 -0500

    exporting auth to keystone (users, projects/tenants, roles, credentials)

commit a0fc03013f972a9aa09a4c0349a7a950837948e7
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 13:10:23 2011 -0400

    make xml-api tests pass

commit 56ca578494681793415143e0d6bbb415a54ad4e8
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:59:10 2011 -0400

    update variable name after merge: flavor_node -> flavor_elem

commit fffc0a640bcd579ee44015e2a9f90b1050669af3
Merge: 8d76f6f 73b6a3f
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:52:00 2011 -0400

    resolve conflicts / merge with trunk revno 1569

commit 3c38299cdd7caad2d9bff2c585d413d0c92983dc
Merge: 73b6a3f 46a58ad
Author: Dan Prince <dan.prince@rackspace.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 0be844491ab4026944cca03b27777dbc4bb9b940
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 14 09:37:24 2011 -0700

    fixed tests

commit fb187d52cf8cf79b544e841e0c9c268d4c0c5fb5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Sep 14 12:32:00 2011 -0400

    removing toprettyxml

commit 8d76f6f1229e80e56a34c12e7c42dbd5dcdb02ba
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 12:25:47 2011 -0400

    add attributes to xml api

commit 08f321f85386e825b02b032d2a301741269d79fb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 16:19:18 2011 +0000

    Remove debugging

commit 833ce9af32dc14ee46cf031a4fb90a114097a09a
Merge: 2657c0a 73b6a3f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 16:19:00 2011 +0000

    Merge with trunk

commit 73b6a3faab981a74a2d827b5aae4785ef9388d43
Merge: 8a967a4 2491a63
Author: Dan Prince <dan.prince@rackspace.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 e0ce036c9feb69740c50278b50d6a06a6bba9b27
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

commit 7140ddae49218e93d7e3debf9eb62113aaf693ed
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 11:55:18 2011 -0400

    fix white space for pep8

commit a53289d04b0a4b2c9b31d9117222f21e10f817fe
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

commit b0f325a51201da82f72741139fcafa20c356fbb1
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Sep 14 11:54:13 2011 -0400

    add extension description for FlavorExtraData

commit c312d9eda5dc9d2661866d7d62317160b6af022f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Sep 14 15:52:30 2011 +0000

    Adding migration for instance progress

commit 46a58adf835932ab3ff9c68e7926f36b347f07a3
Merge: bb0f5d7 8a967a4
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Sep 14 11:34:08 2011 -0400

    Merge w/ trunk.

commit bb0f5d7ff2aa66a6df303f8f56b0cdbfb2349ee3
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Sep 14 11:33:36 2011 -0400

    Make tests pass.

commit 0131f0a2adc2834c9ffce17104c1da4c796c10f6
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:29:46 2011 -0500

    no need for the instance at all or compute

commit a6b56811390b6e3e71fb865abc1f4149de5279bd
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:23:36 2011 -0500

    bump the migration

commit ba7115c54f5f09bbb13abf86dd877955effdaa23
Merge: efd11b1 9756588
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Sep 14 11:23:11 2011 -0400

    Merge w/ trunk.

commit 49fc1a37b317f044bc4a814dab8138fa365446f7
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

commit d7eba71b8257be0d818b49153b83f9433a86aa26
Merge: 8494b99 8a967a4
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:19:03 2011 -0500

    merge the trunk

commit 8494b99e53ac03a0056172c6f19336d2e904be6d
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

commit 72d4d1b81efb79128bd85f95ade35480563e6394
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

commit fd77cfd1012cc61b0b31b5233330cae373d900e9
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Sep 14 10:16:02 2011 -0500

    allow passing in of instances already

commit 9e81b4937cc0c1e4c97a2e2c06fdcb818d2cd70d
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

commit abe396c45a8ade38965430a5ba264969a3a747b0
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

commit 4a7602f9779a50b57224c28ebe1dba007b0365fb
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

commit 8a967a497ec392aae75365d5dcc36da675dd9c92
Merge: 9756588 bfd8a88
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 fe40081ac097c4b8f6f3c60b4b52fafe696a5187
Merge: 5833b75 9756588
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 14 15:00:26 2011 +0000

    Merge with trunk

commit efd11b124d9af20af94b6c474028163d55c88e33
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Sep 13 21:13:58 2011 -0400

    last of the api.openstack.test_images merge fixes.

commit ab643901e483c2dee2231c5a1e8aca21c8588b09
Merge: 3400dc8 fe12221
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Sep 13 21:00:10 2011 -0400

    Merge w/ trunk.

commit 2491a637bd9758e00f88a5e343d6c8e7e98783ec
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Sep 13 20:38:26 2011 -0400

    pep8 fixes.

commit 162671d62fd22c14e4bdc5b311a2ea5052f8a296
Merge: 4f0a97c 9756588
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 13 16:46:53 2011 -0700

    trunk merge

commit 6606d2fe9e1f6a27e9e8c9a154d9407b663e9c21
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

commit 9756588cfab8fc6753efc9787336aaf42c170d94
Merge: bdecc2e b26bae0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 13 22:18:54 2011 +0000

    Deprecate aoe in preperation for removal in essex.

commit bdecc2e61e6268fa3b85b5554ea42f8aa375346e
Merge: f2f66b4 537012b
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 085bdee3dc461384430b4d43ed1aeca1c01b953a
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 13 16:38:11 2011 -0500

    pep8

commit b26bae0f9cef6fc6dee148759d5a68a06ce9fe24
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 13 14:32:24 2011 -0700

    deprecate aoe

commit f2f66b45cba2d39b7ed1685132bfc4932e14c2ae
Merge: 5010cf9 1e48444
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 2657c0af5dd88e1b8c244e85eae2be3cf11f73d0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 21:09:25 2011 +0000

    Fix mismerge

commit cbb4f6a69c8b295b64ffae50079198005fa9552b
Author: Scott Moser <smoser@ubuntu.com>
Date:   Tue Sep 13 17:06:15 2011 -0400

    make tests pass

commit 5010cf9449f9185e5870721d757eb377be62adbf
Merge: 9dfe16a 3e92649
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 a3d4cf66eac725054efb5307cc559714205eb377
Merge: 67bb1c9 9dfe16a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:48:15 2011 +0000

    Merge with trunk

commit 67bb1c911887811dc7c43612f1b4af3f09d504b5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:36:54 2011 +0000

    Test new vendor content types as well

commit 537012b9d09079ba40992375e4f6b11259c16123
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.

commit a54ff2659d36c1cce792bd8b36cc10240cf7183d
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

commit 48c3f9c0a9c2aea42570418266aff12d713503eb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 20:06:18 2011 +0000

    Remove debugging print

commit 3400dc874978092a95954d3a1ac288342df033d6
Merge: 5dfb803 11152a1
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Sep 13 15:59:45 2011 -0400

    Merge with trunk. Still one test failure in test_images.

commit 9dfe16a04f2cfbff58c0ecb30f37827a17a8c861
Merge: 26e7818 046c998
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 19:57:40 2011 +0000

    Inject hostname to xenstore upon creation.

commit f54ddd83edba556aca642f9c75e00795e7c3f700
Author: Dan Prince <dan.prince@rackspace.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.

commit 94beed325ac1d067eaff6c768b4284036a6c427f
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.

commit 77e69fe72daeba47bb4f265a5ce0fdf24fc7019c
Merge: 91ccd0c 26e7818
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:34:07 2011 +0000

    Merge with trunk

commit 91ccd0cdb0801b9c76fcb1b5f1b069036df1a411
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:33:09 2011 +0000

    Actually test expected matches received

commit b0bcc35a13cf4ec2a06fd604c0eb62960cf92a03
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 18:32:42 2011 +0000

    Test new content-types

commit 26e781823fbeacb74f4505dc3e958b878e299166
Merge: 281fc56 aba6155
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 9b0fb3a4b28f1a7762efe602667883518dbe7402
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.

commit aba61559ee48b75e4cb289f275614de886135a6a
Merge: d182885 281fc56
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 14:00:20 2011 -0400

    Merge from trunk.

commit 046c998fbc3e79a4d8d5a545a8f4d3fd67052e32
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 13 12:33:09 2011 -0500

    Inject hostname to xenstore upon creation.

commit 88429f2587a00f115a44b5f25e43fa15f60988c7
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Sep 13 11:09:27 2011 -0500

    drop the virtual_interfaces key back to instances

commit e3a0dae8c46d9ac2750890bc58fa30767b481f86
Merge: 37629f3 281fc56
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:56:27 2011 +0000

    Merge with trunk

commit b2ece5a9f197d30456092faa2bc813ed4344de92
Merge: 6f6f351 281fc56
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:49:37 2011 +0000

    Merge with trunk

commit 5833b752601a8cae67132c183c666b1abb75d00e
Merge: 342ebad 281fc56
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 13 15:47:25 2011 +0000

    Merge with trunk

commit 281fc563d05d0326a8b367df9cdce6cfca189057
Merge: 95ef36e 20d389d
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 d182885db6173e881ab57b6e90d23b92d117c829
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 11:22:45 2011 -0400

    And again.

commit 95ef36e1f7242e36665ccf50e65862390796a936
Merge: fe12221 96db9a6
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 4f0a97cda14712211c2fee022aef4d93add13e52
Merge: e961b4f 11152a1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 13 07:49:03 2011 -0700

    we're back

commit 96db9a64e4a16b71cfa162fb81628e65f43e7f34
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 files changed, 1 insertions(+), 1 deletions(-)

commit fe12221829e8af3f03346a0ad3b10f381b786205
Merge: 11152a1 d6251a1
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 1db94928f180ec0b53e23ba3b95c6f8bcc8e874b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Sep 13 02:45:11 2011 -0400

    Same as last time.

commit c4628b7560be5028d69b72fdcff9ba12b33ac926
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Sep 12 19:13:18 2011 -0400

    Made tests version version links more robust

commit 342ebadc1679974f8a36524c5733fd6c2dadb0c1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:59:46 2011 +0000

    PEP8 cleanup

commit 6f6f3512d095df53106a2ec4b2c980860a2a256b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:58:07 2011 +0000

    PEP8 cleanup

commit 699cf36b02698d34ceeba834fe087dc79d984f67
Merge: 54d96be 11152a1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:46:43 2011 +0000

    Merge with trunk

commit cace78e071fe972e802b254c7a55d4d636d8b449
Merge: d0ba1ae 11152a1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:46:12 2011 +0000

    Merge with trunk

commit d0ba1ae9d2fd7e2449ab94e39aaa4a9450066f5f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 22:45:38 2011 +0000

    PEP8 cleanups

commit e961b4fbc1a2cc4973173c18f2eac2fc61a476e3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 15:36:18 2011 -0700

    zone manager tests working

commit d6251a11a44a58c65b9c1b356fac66c1d62d98a7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 18:23:46 2011 -0400

    fixing import

commit 3da4dc7b8ea0068153f63f847ab8fcd3d8933829
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 15:22:30 2011 -0700

    working on getting tests back

commit d178e3b93378ed228cf83831a05fc9da965b275a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 18:17:32 2011 -0400

    relocating ec2 tests

commit 20d389d2623c9e955d7ed70713eea576a2a00e54
Merge: 8da97f6 11152a1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 17:52:29 2011 -0400

    merging trunk; resolving conflicts

commit 11152a1733724f9e565699ffbeb35d4f3e920cc5
Merge: 77dde28 cb82539
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 54d96bee3137e48c6027f389aa9a8d9b01147e14
Merge: e3fc6f4 77dde28
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 20:48:43 2011 +0000

    Merge with trunk

commit 77dde287b531d8762cf7082e8783093b67a1e613
Merge: 4900f9e e118f51
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 37629f32dda875467c30df05e942b16f7d9ffe51
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 20:10:57 2011 +0000

    Add support for vendor content types

commit e118f51f40212aecb74c39a142cf63d8b22a1d83
Author: Antony Messerli <ant@openstack.org>
Date:   Mon Sep 12 14:43:15 2011 -0500

    pep8 fixes

commit 8da97f65b4a8598df34da5c080575fa796f155b0
Merge: fadaed5 4900f9e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 15:39:13 2011 -0400

    merging trunk; resolving conflicts

commit 4900f9e2d6176356db787f9c1f00beea00e8da93
Merge: 23b9a98 f73c594
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Sep 12 19:37:08 2011 +0000

    Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with Glance keystone.

commit 37b7ad363137abd4738ebf45fa37e88e2a7769d6
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 19:19:04 2011 +0000

    Fix typo (woops)

commit f73c594a2656a7738b0bf9b4a90a22ba25c0f7ae
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Sep 12 15:17:57 2011 -0400

    pep8 fix.

commit 2b8982f1458acc3363eac0a8adf31753af0102fe
Merge: 4432f2f 23b9a98
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Sep 12 19:17:46 2011 +0000

    Merge with trunk

commit 23b9a980700bfe330de9fe28c8cf9a2526b020ca
Merge: 44abd42 b150c91
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 fadaed597ea31fac3766c7793c905a9188536cf7
Merge: 1a999a2 662c1f9
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 cb825394e920d56d696718edbbda198952a22d17
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 14:22:46 2011 -0400

    adding tests for deleted and pending_delete statuses

commit 44abd429da112ed2ea35e55cc4fb47fc25baf7f6
Merge: 77fab71 0c40181
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Sep 12 18:07:09 2011 +0000

    Fixes rogue usage of sudo that crept in

commit c76d45317a8f6fcd1015aa81d1083eefab6df8d8
Merge: cad71fa 77fab71
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Sep 12 12:53:56 2011 -0400

    Merge from trunk

commit 13a453187b8658bad6e5a699dd6e2939a64cf149
Merge: 4b76cff 1aaad35
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 09:29:08 2011 -0700

    fixups

commit 1e48444b81b3703fa71fafb107c4438ed8db96ee
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 09:15:31 2011 -0700

    remove unused dep

commit a034fe82a62fbfde5d2661e557d217eee86c557d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 08:00:30 2011 -0700

    add test for method sig

commit 1aaad35e69352f9c24efa9d2c99c569a53f00b22
Merge: f0d355e 4b76cff
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:42:28 2011 -0700

    parent merge

commit f0d355e67bd73b6549770adc916473b27cbbae42
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:37:02 2011 -0700

    migration move

commit 4b76cffd0dec7a5f69cf76772cdc6d4a4b2de9d6
Merge: bb014e3 970c07c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 07:36:14 2011 -0700

    bug fixes

commit 1a999a2e9ad0fc1e5114f9c6009c349cc41ddbe0
Merge: 9fc3859 77fab71
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 12 10:13:34 2011 -0400

    merging trunk

commit 77fab713dbbbb9dbf9d7486912b7c946c7aea413
Merge: 970c07c bc3d17e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Sep 12 13:52:04 2011 +0000

    Fixes shutdown of lxc containers.

commit 19584d922c8b1de0092cd8a0839dd72e089c7093
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Sep 12 09:20:11 2011 -0400

    Make quoting consistent.

commit 0c4018182c572cb42b6d2202f5a7890c7f0fc3fa
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

commit c997db105a6d93307efd0024b496b26703ba849f
Merge: 8f6c92e 970c07c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 05:01:02 2011 -0700

    trunk merge

commit 8f6c92e8ce23e417957d13071111dd4c459428cd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 04:59:58 2011 -0700

    region name

commit bb014e386a419bec255dae2910eb09bbdda0781c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Sep 12 04:58:39 2011 -0700

    tweaks

commit 1fe34e8a787d6c47f971091bf353c3ec8c6583ba
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Sep 12 00:16:49 2011 -0700

    fix for lp847604 to unbreak instance rebooting

commit 970c07c528fd207037512f08c293ca9160dcc0f3
Merge: 793e00d b1ca06b
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 793e00dd40c595a2a6105a14894d31ce28c17d67
Merge: 9df88e7 17d09f6
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 9df88e7ad67ce76326f7f37a53b6c3999d573ba4
Merge: b5da15a 5996252
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 b5da15a7cf39ba798b22bdcc2143b384bab58f9a
Merge: 6f88294 a4fc5c8
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 662c1f92ccb1b257f24776685f6a899f932e9ed6
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat Sep 10 13:56:54 2011 -0400

    Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with
    Glance keystone.

commit 3e92649bec38702d57c765cfeae19d60e6848a93
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

commit eac85af72aebbd5ced044ccf022254d37c1401af
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>

commit 724f0570ae5d7033450512ac5a9ed638bccde26a
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>

commit cad71fa790eb5a3fa93af7e451a25cd73d7f761d
Merge: bdf73fe 6f88294
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 9 22:14:39 2011 -0400

    Merge from trunk

commit b150c91a6e475d0cd7f1bd12e83c4d4553dd4584
Merge: fed524f 6f88294
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Sep 9 20:48:53 2011 -0400

    Merge trunk

commit fed524f719776f961ac50d0862bd0f2a9213af8a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Sep 9 20:47:37 2011 -0400

    Fix spelling mistake

commit 6f88294b16ddda1c310bac6dc745ab09094654ad
Merge: 32fab72 50faf7c
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 32fab72ea1b22a1dce7206020aa7732e9071f68b
Merge: 6b76ce2 a327266
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 9fc385969856a12fea0ca603f1e0576f5d014262
Merge: 65de610 6b76ce2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 17:27:42 2011 -0400

    merging trunk

commit f53042afdc48be40693499ce8fa94ce8d0f38005
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Sep 9 17:25:45 2011 -0400

    fixing image status mapping

commit 50faf7c87b4591503c1338cecc8eeb519349a00c
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...

commit c478ef7f068c15b28b8ff62bb0ccfc6c50aaf7d8
Merge: 8cc72df 929e7a7
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 ed1763822b7fb0842d611c39befa35acdb06fee2
Merge: f188a49 6b76ce2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 9 12:58:29 2011 -0700

    trunk merge

commit f188a49e02842933814b9d1e3812ca89a25d43be
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 9 12:54:22 2011 -0700

    adding auth tokens to child zone calls

commit 8cc72dfae341cf75be14357161c83ae689b78505
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

commit a327266432db80601ec3a1081edd94a53c0f42f6
Merge: fb29bb0 6b76ce2
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 9 14:05:11 2011 -0500

    Merged trunk.

commit e3fc6f4f1c889cd29a6cde1eda8f5d30b9499b33
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:38:01 2011 +0000

    Make whitespace consistent

commit 22fde3339c721b1717eeefd1f60af1917cabad5a
Merge: f7e4f48 6b76ce2
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:35:07 2011 +0000

    Merge with trunk

commit f7e4f4810049c6f31787a173bdbbeb4f3b788ce0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Sep 9 18:33:36 2011 +0000

    Use triple quotes for docstrings to be consistent

commit 6b76ce2f4e35542b7c63cf51801238fb42d4fdd7
Merge: d8703ee 7ca2f41
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 d8703eedb0de2f67014a5ef1cdfd38cfb9a2b70f
Merge: 929e7a7 da358bc
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 fb29bb06a4aef0bfccb1ded87221ebd920322592
Merge: 137c559 929e7a7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Sep 9 13:05:33 2011 -0500

    Merged trunk.

commit 02f7a4121b653f58f2aa87e2d62a78fc518339aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 10:44:06 2011 -0700

    remove extra line for pep8

commit bd1e07e8d6eb32424b9e77c51aab324906d5942c
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

commit b415a4572b85f6f38bc9679ff7e0372d914a6c19
Author: Scott Moser <smoser@ubuntu.com>
Date:   Fri Sep 9 10:20:36 2011 -0700

    shorten comment to < 79 chars

commit 36b66a299e4550bcd7ab8be46e9a628ccc808e5e
Merge: 1ffaac9 f6f83e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 10:14:24 2011 -0700

    merged rbp

commit 7ca2f4163a644ce98fb9c95d845b2940df0a8c10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 9 08:59:02 2011 -0700

    remove sudo from qemu-img commands

commit 929e7a75214d2e1ad1289e4604a6d3c492e16846
Merge: 630683e 1f64a40
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 630683ebc8312691d9bca0dffd48fb7c5519ab23
Merge: 1caef35 82f0a84
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 da358bc1fa782fb8464d7b853d816b752fbfd637
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

commit 913deedcf36af11a8425c862031513c54c4e03f1
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 9 15:21:00 2011 +0200

    Authorize to start a LXC instance withour, key, network file to inject or metadata.

commit 1caef35679e0ff1183df9341ae4f2e47f1fbdceb
Merge: f6f83e5 249f9fb
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 08:56:42 2011 +0000

    Open Essex (switch version to 2012.1)

commit f6f83e50a78dc62710945375dd7a69cb92f93e43
Merge: 0e2ae75 61ff9d7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 07:41:53 2011 +0000

    Last Diablo translations for Nova

commit 249f9fb1c288c3bae4cc8f7e81bc5a89f27c0eff
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 09:27:26 2011 +0200

    Open Essex (switch version to 2012.1)

commit 61ff9d7a4b2dd1eec5917bfa10ff5caba5883c07
Merge: 0e2ae75 79bb74f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Sep 9 08:46:58 2011 +0200

    Last Diablo translations

commit bdf73fefcfc210130038f4717b5748969b65679c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 21:37:40 2011 -0400

    pep 8

commit 69200b2cfa1644c3eda92b5328b69f61216a5fa7
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 21:30:21 2011 -0400

    Fixing security groups stuff

commit 3479698a53bd03ac848abb038629571885c00e98
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 8 18:02:02 2011 -0700

    put key into meta-data, not top level 'data'

commit fd2662731bdbad91ba03d5b2a58435cec84f1286
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Sep 8 17:42:49 2011 -0700

    metadata key is 'public-keys', not 'keys'

commit 0e2ae750e10c2c45a210c2a2047d6508ef4f2087
Merge: 37f266a b58642b
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 3d64836aecee23c1771d0a59b01533195e850f9a
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

commit 37f266ab65bee51b53138c54890743474c77b002
Merge: b634164 d2597a6
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 137c559296f34a409fc1bd8a4a26adc66fd4f512
Merge: dacec74 b634164
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 16:10:45 2011 -0500

    Merged trunk.

commit dacec749cb7b43cbfa3bc7a45cb9b5547b96a9e8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 16:10:03 2011 -0500

    First pass at adding reboot_type to reboot codepath.

commit d6a501ab89fc2c4fac1beea275ca5c8b1092b372
Merge: 34aade1 d82d073
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Sep 8 13:53:03 2011 -0700

    child zone queries working with keystone now

commit 17d09f65614799efaa5cb1af97a560ef2549d2ca
Merge: 66d0e0d b634164
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 b63416477ba44cf7a1484c9a09760ce92f1179d7
Merge: b96b987 7e6b00d
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 b96b987cfd3a89c0ed4b38dad63b26a2ce7cc022
Merge: f1b1197 39355ce
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 b58642b2e27508fc67fe17981c29e38f1c3f07bc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Sep 8 13:18:08 2011 -0700

    make check for fixed_ip association more defensive

commit f1b1197ab3f96e862d5a3767956bd1d0e4b41e4c
Merge: aa198b4 a958024
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 aa198b40a25afd56bb8f86bc1d7944816cbdeda5
Merge: 74123c0 337d2c1
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 a958024c68c8f6119dfe7e16741198f0515eb2ec
Merge: 36a437b 74123c0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 12:40:45 2011 -0700

    merged trunk

commit 65de610589f5df22b4ff7afb9baddc1c5ae0ea0d
Merge: e386b25 74123c0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:40:30 2011 -0400

    merging trunk

commit e386b25371e3f0676aba98bfca450d3966a39fa1
Merge: 7c576e1 e6bd02a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:40:07 2011 -0400

    merging trunk

commit 39355ce8dc1115f6a8b177488fdc1562b43d09d8
Merge: 57c3db4 74123c0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 12:33:43 2011 -0700

    merged trunk

commit 74123c0086c68abf6cd7248c83453c4a31dc9023
Merge: d7d35c9 5f37213
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 82f0a844c7532c479c4bb7533a99884266f8cb7b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 15:26:44 2011 -0400

    converting fix to just address ec2; updating test

commit d7d35c937fcac7d1b8d0aa4bde8b1c1e483f7611
Merge: d82d073 f30fa3e
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 7e6b00dadcb408daa6f7b9708ccebaaa2a8d5130
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 19:08:46 2011 +0000

    Add a NOTE()

commit 337d2c1952c15ec96301633128af4dfb82f8676e
Merge: 4d1c969 d82d073
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 8 11:47:56 2011 -0700

    Merged trunk

commit 9ef295e3ab2510b279b634ddce8078063723926a
Merge: 19b0e88 d82d073
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Sep 8 13:44:37 2011 -0400

    Merge from trunk

commit f30fa3e38e8342c5395abad8a16882a780b62505
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Sep 8 12:11:39 2011 -0500

    Use .get instead.

commit 1535074f7c0a75974e3be44cfa85c7553daa4ae5
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.

commit 04f367c77bba60fc49a3498cf45974b0fce515bf
Merge: 9db472d d82d073
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:41:55 2011 +0000

    pull-up from trunk

commit 5f3721318388f6a8c3f335aaf565d07039ce44be
Merge: 0e9c84e d82d073
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:41:27 2011 +0000

    pull-up from trunk

commit 6b42e7b4d80b9cefca19410d9719e30160034ff2
Merge: 1142a47 d82d073
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 8 15:40:52 2011 +0000

    pull-up from trunk

commit 7e35b9bc3c9807cdac73abebd7de4526a41e2861
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 8 11:32:11 2011 -0400

    adding can_read_deleted back to db api

commit bc3d17e5029ba1af0f78784bee6b401ee65dd377
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Sep 8 10:52:29 2011 -0400

    Clean up shutdown of lxc containers

commit 63f1da38bb4e9a8410899ecf99fce083d5832dbc
Merge: 7c922c7 d82d073
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:54:10 2011 +0000

    Merge with trunk

commit 7c922c749e2ed1456610542f4aa95e051d8b3a51
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:53:51 2011 +0000

    Cleanup some more comments

commit 7edd8ca73f0f3c734ea4046df02f195bfc6b4dc4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Sep 8 13:53:31 2011 +0000

    Cleanup some comments

commit a4fc5c829bc68f97dc550be1291ef4b50a2f6101
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 8 04:45:04 2011 -0700

    fixes vncproxy service listening on rabbit

commit 57c3db4c9adcd4cd334b60aae963f1cc975b2414
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Sep 8 01:09:22 2011 -0700

    added tests for failure cases talking with zones

commit d82d073b050ab7a3ad569082dd0a1c63a473f5ff
Merge: 35cecb4 67a2653
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 0870f67435b79a57a4ff35331dada27ceb824531
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Sep 7 23:45:11 2011 -0700

    comment fix

commit 28c81befbde061117abee23c1c372138d2f4cd3c
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

commit 6de33e62c3f628ed2cedd05eb852d1f1ed8e6ec6
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

commit 36a437bfdfd628dcb17d80fd590ebfc6a8f4b468
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

commit 6fd009525382fbff4f075b83665797a0822de32d
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.

commit 444d5d138be66b69f03e674afa18e2a990e82dc7
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

commit 294a76a39e661a62bfcf4b0b1f4f839e944b7650
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

commit c5fcfa58d75030449f1642aecc64e2cb87cb0e6e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Sep 7 16:38:41 2011 -0700

    fix for lp844364: improve check for fixed_ip association

commit 8abbb62450d6b95af1b6fe974812be4cb11493d2
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

commit 9db472d008270334c30cb7617a97bd92fbd7b6af
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 18:08:39 2011 -0500

    actually shuffle the weighted_hosts list...

commit 85c0295b331c9e356ad7ec15306652d1d5944f27
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 23:03:18 2011 +0000

    Check task_state for queued delete

commit 6fa4fe123722ef0d540df0a4467945d09b55fff3
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 18:01:52 2011 -0500

    spread-first strategy

commit 1ffda6eea83e0b785a440d7d24db82edcb213727
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

commit 7c037664967289aefbadeb46171eecca0b0af7a1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 28b91b2780e1f94b86349d12547082bcb8573a60
Merge: a31f946 35cecb4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:40:05 2011 +0000

    Merge with trunk

commit a31f94668c37a74a1b85c0ce07c72b2bcec54f6c
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:39:15 2011 +0000

    delete_instance_interval -> reclaim_instance_interval

commit 1edbc5cc2d91fbc15fbd273242f9ae69fad3c725
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 22:33:59 2011 +0000

    PEP8 cleanup

commit 47afd1aeb086554129bd050420bc62f309f527e4
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

commit 4432f2fe6acf019acda89301047af8f00eb90eaf
Merge: 7d8b2d6 35cecb4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 21:55:18 2011 +0000

    Merge trunk

commit 67a2653d6808553e69d853e24f08a136f8069ffc
Merge: 7674d97 35d22a9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Sep 7 14:27:06 2011 -0700

    merge trunk

commit 1f64a40d2436827a1bd63e674dcc87dc2dfa564d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 16:06:35 2011 -0500

    properly handle the id resetters

commit 17349930c739d9e7a618ecdc6d05640956d4b05f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 15:48:31 2011 -0500

    removed vestige

commit 0e9c84e1efd1a707ccdbdf7f43b8b27e56d94437
Merge: 2340104 35cecb4
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Sep 7 20:41:03 2011 +0000

    pull-up from trunk

commit 234010426661f329af937e6042145a8d063b6fab
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

commit 4d1c969b6cae08f6bc03094b6118c9c6d409b9b1
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

commit 5322f9f07580a3e8fabf879e1cc47ef8c9827f3d
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

commit 65d8fbf1eb1a3fe644c981a9cdb916078e9841ee
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 14:36:22 2011 -0500

    forgot _id

commit d326ae38ac4edf34afa2041f0e457c9a450caa3f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 14:33:43 2011 -0500

    had used wrong variable

commit 35cecb44a48e3fcb7639144e32309643d6964b2a
Merge: 35d22a9 b374634
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 d2597a66bbfd5aa01a258b513588fd0c033deeea
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Sep 7 11:41:33 2011 -0700

    Fix for LP Bug #837867

commit fc42b2ff11c18d0fb9f36506bc9dba7d6e58dce0
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

commit b374634bf17e8ea7c8ffd1ab19a493b64015fb4d
Merge: 454651f 4778a86
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Sep 7 14:18:45 2011 -0400

    Merged trunk.

commit 35d22a995cae2521f0f46ea29f88782bd3c0408b
Merge: e6bd02a 2f4b282
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Sep 7 17:46:55 2011 +0000

    Set flat_injected to False by default.

commit 0fc4af6214b52200c4b2fe2837f6b82abd82de75
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 12:41:16 2011 -0500

    changed the fixed_ip_generator

commit 7d8b2d6b950cd0e904e859af96bb86bbc87a7272
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 17:23:20 2011 +0000

    PEP8 cleanup

commit 9e9c5ad555f813c3d45ed070e48b1a12876652b1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 17:22:48 2011 +0000

    Wait longer for all agents, not just Windows

commit d1a1a06294f293d3f68a4e96b84ae9823ee94807
Merge: aac5918 e6bd02a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 11:12:23 2011 -0500

    merged trunk

commit aac59188a2b9c12fa85924962d38825c67c75cf3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Sep 7 11:11:19 2011 -0500

    updated floating_ip generation

commit f1ccbc0ca88f0dce1ef08928fdfb4d07fb1fcfea
Merge: 3312159 e6bd02a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 15:38:28 2011 +0000

    Merge with trunk

commit 3312159c103786907894147379950fac02cea998
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Sep 7 15:31:38 2011 +0000

    Tests for deferred delete, restore and forceDelete

commit e6bd02acdc71a5caeb204887f9e92dfbb47e15de
Merge: 17c3628 4d85f52
Author: Thuleau Édouard <thuleau@gmail.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 4490d1d229d1365d251bb74fc78bd6af7250cb85
Merge: 491de9e 17c3628
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Sep 7 09:28:45 2011 -0400

    Merge w/ trunk.
    Fix test_rescue_with_preset_password.

commit 34887b453ec133004c185cdfb1800d120dc8f4de
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

commit 2f4b2822cce519896d35d9170e96f45f0342adfe
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 6 16:41:35 2011 -0500

    Fixed unit test.

commit 7c576e17f0647464bdc698a239e19dad7d227fde
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 17:38:48 2011 -0400

    reverting change to GlanceImageService._is_image_available

commit 17c3628d6bc67ed063f6e24e1baf8152cd116e3b
Merge: 394cbc9 67e9a06
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 a8cb5e15c961e97d0ce9183e984cfdcf92f558ba
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 16:28:34 2011 -0400

    reverting xenapi change

commit 394cbc9ff803959432fce936d18a074d84c178d1
Merge: 4778a86 6bd3841
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 6bd3841c7f508f77a4fd722362ea7692e9a04487
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Sep 6 15:02:04 2011 -0500

    Fix a misspelling of "exception"

commit 67e9a069eb2319e9c9269204f1baacd741519931
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 6 12:48:41 2011 -0700

    revert changes to display description

commit 38ec583b48dc44e4dda2abc78ef35abb500e485c
Merge: 18402ba 4778a86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 6 12:47:09 2011 -0700

    merged trunk

commit 1142a47d07a73ddd9ae7a3c6ac00b15830a46a10
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

commit c1eb7d79dcc080b59a6ef11e8c16464bfc4b60d9
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Sep 6 14:26:02 2011 -0500

    Set flat_injected to False by default.

commit 5dfb80347ef66418cf31609d90d62d935a29dc45
Author: Dan Prince <dan.prince@rackspace.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.

commit 07ec9bcb37dc511a9afabf579dcaa89b2a0abc4a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 15:16:40 2011 -0400

    further cleanup

commit d4de09fdbb282e9ff2669e697bc1ca21bd33fda1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:36 2011 +0000

    Default to 0 seconds (off)

commit 1cd9f8c7648b80eb6792e7f57c825850a8ec34a0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:22 2011 +0000

    PEP8 cleanups

commit ac107bae21a8db2af3df787a2f9c96369283727e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 19:12:02 2011 +0000

    Include new extension

commit 63ee238810b3de7ea0bc633cc93ae605472c287a
Merge: 8e6e68a 4778a86
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 15:23:10 2011 +0000

    Merge with trunk

commit 8e6e68a1104dac0643330637845ad022cc57eb32
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Sep 6 15:21:15 2011 +0000

    Implement deferred delete of instances

commit 34aade12a78c332788e2f22b76861b680db46eea
Merge: e2a5a37 4778a86
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 6 07:37:03 2011 -0700

    trunk merge

commit 512f1d10d983b83dae196cdb9aad8e847460de98
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Sep 6 09:24:24 2011 -0400

    cleaning up tests

commit e2a5a370801b325bc30ac3076d816345408ee946
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Sep 6 05:00:18 2011 -0700

    zone name not overwritten

commit 491de9e22c31c9d2915c79d66bf37babcc100aa7
Author: Dan Prince <dan.prince@rackspace.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

commit 868d4a333d9429ec40f80310fd596e62c2b2aa47
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.

commit 952f744937dd588933c488d3e15c4a7e43525f9a
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

commit b30a54754b9c2e450aebda05068dc7bf2b302667
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Tue Sep 6 10:20:28 2011 +0900

    revert codes for db

commit cb3d68b2a72f5f3e62111483604a2ec8975f1da2
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

commit 48a6d6b02f94bafe1c7b5272147dcda094e6056d
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 files changed, 1 insertions(+), 0 deletions(-)

commit b134685bf2f657ec1039fadfad473a6a9b797d5d
Merge: 4fdbe72 4778a86
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Sep 5 13:09:17 2011 +0000

    meeging trunk

commit 870bd9cafe13f0906a929925f36de29479e26b29
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 21:32:52 2011 +0900

    format for pep8

commit ea8f99c685229609f29f7eff34cf3df89d673e6a
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 21:13:00 2011 +0900

    format for pep8

commit e1abc8135f88487db13185a7b29dc66205751c59
Author: Keisuke Tagami <tagami.keisuke@lab.ntt.co.jp>
Date:   Mon Sep 5 20:23:28 2011 +0900

    implement unit test for linux_net

commit 512f025733a20414285e3f9f7a0e7f235105bfce
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.

commit 22913460d61107d0446783a69151f2ab1d7c03be
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 5 12:05:47 2011 +0200

    Clean up security groups after use

commit 83ea1f9006ebc86598e0ef2d41803ebdb87317ec
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.

commit bfd8a882bf4cace98727d757b413b8b078511d1a
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.

commit 81de93411dcf58e5837e27ba58f7223e67858c39
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.

commit e7a9e8c4ca0badd212943e7905eb7f7b43838a08
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.

commit 19b0e88cbb7af6289442019aaef7e39cade5cb52
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Sep 4 05:39:59 2011 -0400

    Minor cleanup.

commit 23db534d741c6178edf97caded6640f51c511c24
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Sep 4 05:39:21 2011 -0400

    Fixing xml serialization of limits resource.

commit cfb7fccdcf19b560fbaa438427a98b75b327ad71
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

commit 1decd40b5b41df399897ca56d9152c27b5919bc6
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

commit 4d85f5214e894b2f7f717ae93481a94782420d64
Merge: 58dc741 4778a86
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Sat Sep 3 09:40:19 2011 +0200

    Merged trunk.

commit 58dc7411a9284e71251f0064277ea88070b8668d
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Sat Sep 3 09:36:06 2011 +0200

    Change non E ascii characte.

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 79bb74ffe7ff2c1e8c221d24b6c2849d52c2fd4f
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Sep 3 05:50:53 2011 +0000

    Launchpad automatic translations update.

commit 4778a8690550414549305799503908f74054a6ac
Merge: 730cf5d dc6dc46
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 dc6dc4673528eaae3f0437cf10148ad885f0ee05
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

commit f96f49590e2b33640703188f1c62631d32c867b0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 18:02:41 2011 -0500

    removed unneeded import

commit b0fe37374326ba4501a491daff30f1ce13f8f01b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 18:00:34 2011 -0500

    rick nits

commit 3ce6ad037012a00110ef0150d1fd08214e403967
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Sep 2 17:28:58 2011 -0500

    alex meade issues

commit 730cf5de2dcdcb6d9429699fd40c9db0c4eec8d1
Merge: 2f5a8a5 cdf89bd
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 18402ba129657e52feb34bc677278052ca46a8e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 13:31:19 2011 -0700

    default description to name

commit b1ca06be54ab80b8c82b95cc48ff7433ad2203a7
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)

commit 2325390b5ed3452efa4815532beb3739c8db8690
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 13:24:40 2011 -0700

    remove extra description stuff

commit 7674d97675f9ab4399ab1c2dfd4bffbbffa3e359
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 13:24:38 2011 -0700

    fix pep8 violation

commit c379f7bae059b2257148d90fd060846717a214e8
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

commit c57e2744364c98838a06dc300080e4882e0207f5
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

commit bcf7ad309e4e40a7a7335a3333d9283b19256dd8
Merge: 1cd61fb 2f5a8a5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 2 12:42:43 2011 -0700

    merged trunk

commit d43d08a90c1b6a8afd84c256951ea902f6f2a12f
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

commit 66d0e0dca89840f7351000a385dcdcea14fb94e8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 12:34:14 2011 -0700

    Fix for LP Bug #839269

commit b6c3553545e3fae0261b566ad05225a2e96ae4c6
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 12:31:14 2011 -0700

    move networks declarations within upgrade/downgrade methods

commit 02681927448464818f131adb22c3016d0da86c6d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 2 12:11:28 2011 -0700

    more review cleanup

commit 77ec8195decf1e82a875e5004354c912ff728cb9
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

commit 2f5a8a5449cba3143bc7105c67684ad80bd0d1bb
Merge: 63db6c0 86280e7
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 0e1bb588a7190d7633dfc3e3af255ddb6adb0a42
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 20:29:58 2011 +0200

    Email error again. Tired.

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 672927a9d6bc9cc7808d99741561528275df978b
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 20:25:18 2011 +0200

    Email error.

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit cdf89bd23cb18994b8e8cb2d2c458435d259e458
Merge: 54ed4f5 63db6c0
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Sep 2 11:00:33 2011 -0700

    Fixed review comments

commit 86280e7cc2cec33c4223e2917af757d06e143b37
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 12:31:10 2011 -0500

    Add documentation comment

commit 43cfc3c696a37067848352c049ea12bdca2f6a7e
Merge: 350fd97 63db6c0
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 11:01:05 2011 -0500

    pull-up from trunk

commit 350fd9792b106d99cbd49788b1f31c9863c883db
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Sep 2 11:00:03 2011 -0500

    Forgot to handle return value

commit 1ffaac9fcab3f257931cddf59b1b0db6bd69b7f0
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 17:49:45 2011 +0200

    Add tests for flags 'snapshot_image_format'.

commit d4c0f073b8a12cc8ec85b10dc618704621499cef
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 17:39:37 2011 +0200

    Update snapshot image metada 'disk_format'.

commit 2d6838e5354bbab4064cb1b7c68183dd9147eca1
Author: Thuleau Édouard <thuleau@gmail.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.

commit 539ddac4b4cfdd2d93ea196864a61481dee3b583
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Sep 2 07:38:22 2011 -0700

    missing migration

commit a11d4a8325e65d8bff6108ce690e1dc9be7c5c8f
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 16:17:18 2011 +0200

    Email contact error.

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 05179b96a67ff4835a03e0321be2bb27dd307e6d
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 16:01:13 2011 +0200

    Update Authors file.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 8a0fafff18af00f9c5e738a78455df42f3ee084d
Merge: 3b10c39 63db6c0
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 15:58:20 2011 +0200

    Merged trunk.

commit 3b10c39f98c14f247210786ba0f36f523553f390
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Fri Sep 2 15:48:32 2011 +0200

    Correct tests associated.

commit 63f7ee83ee21cc476ba2066f7509355f3360f9f3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 2 13:44:10 2011 +0200

    Fix protocol-less security groups.

commit 1d212c2a00e3fb470d1b400a6581d590ddcb2a86
Merge: 7e5ab59 63db6c0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 2 01:39:31 2011 -0400

    Merge from trunk

commit 7e5ab59a412f9303f8cbe71843c57874b261ab25
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 files changed, 1 insertions(+), 0 deletions(-)

commit 5894e84ac07d2608f187863f2b4b98c65161149d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Sep 2 01:07:30 2011 -0400

    Removing xml functions that are no longer called.

commit 3c3b0e44031f426134dc7ab254e39187e42f96ff
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Sep 2 04:53:10 2011 +0000

    Launchpad automatic translations update.

commit 63db6c08184ecc1a4db6da1c08c3f3a75b2347ac
Merge: f4b911b c38eadf
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 1b6fc3aa77b8ee4a7029cd1bedfd8ed55589de7d
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

commit a384affdd6970b2824d3ede907fe802df74710df
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)

commit f04a4dd84a608e257bb5a226244249b6858808ae
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 14:40:30 2011 -0700

    melange testing cleanup, localization cleanup

commit e7811023d41e1437de1f1f18c748dda56ab88b09
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

commit 54ed4f56aeee5926d2cc084ff116994d837018d7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 1 14:32:48 2011 -0700

    Deleted debug messages

commit 13c2ecc597d5149828294ae7c07eaa7f5c6bd42c
Merge: 4d1729e f4b911b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Sep 1 14:29:43 2011 -0700

    Resolved conflicts and fixed pep8 errors

commit f4b911b4d96a084ec546ecbc53c190cbdae7ec07
Merge: 34b9da3 e7a5e1c
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 4d1729e6269d4ff8a6752867d2d5403e677cf15d
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

commit 1055fedc258c6c7c97d8c1d53916f685fac03108
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:50:38 2011 -0500

    renamed fake_network_info.py

commit 2129945d6f47da15c5fdf55edca8240a775b6750
Merge: 59e17b1 34b9da3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:30:52 2011 -0500

    trunk merge

commit 59e17b11aae62ea0eacf58a2fc923a7de45eea66
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Sep 1 15:29:00 2011 -0500

    moved cidr_v6 back

commit 454651f07ae5d825a2bee0de0905ba44b297b602
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 16:11:14 2011 -0400

    Probably shouldn't leave that commented out.

commit 02d06c4f268346452856feb9d572783646a68816
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 16:09:23 2011 -0400

    Added test for NULL network.

commit 64a6bf6fd7182ac23a73f9ca1ba1d7a5d45c4b70
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Sep 1 15:42:31 2011 -0400

    Fixed lp835242

commit ad14105417f0a29f43ab8c21204b5a92283b2baf
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.

commit e7a5e1cceda5e1cef1529b2e03606523dea11426
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 1 12:22:32 2011 -0700

    remove extra references to state_description

commit c38eadf20c88a78f64842de01cadc413a4d247f5
Merge: 650e949 a4155df
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 19:19:38 2011 +0000

    pull-up from trunk

commit 650e949f5299520b3d24e9f5d649ee6b66b35627
Merge: aa9e7ce 791eb1b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Sep 1 19:19:19 2011 +0000

    merge unit test from Chris MacGown

commit 791eb1bcd0e088d88a6b40b791fe17219c2a506b
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Thu Sep 1 12:05:21 2011 -0700

    Adds test for image.glance.GlanceImageService._is_image_available

commit 34b9da3c9ce459340befec8f578e3ce99cd11ae8
Merge: a4155df 5a8a0e6
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 94620b46a5b307b2bd82eba8e2906adac371910f
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

commit a75e2cb590559febe888291bec24d796e81ffa34
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 09:39:36 2011 -0700

    additional review cleanup

 .mailmap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 4fdbe720f04712b4dbe8c27421483a77c2d7a2cd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 11:40:44 2011 -0400

    docstring cleanup

commit 5a8a0e6fd29861b566b8c25a052ba52518714c41
Merge: cf21fc0 df17b52
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Sep 1 11:08:41 2011 -0400

    merging trunk

commit a4155df8e35a62a75de1724d771ad571733c4ad8
Merge: df17b52 4f95452
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 b4c118c6515f0caea8ef25ab44507575c7dfe0cd
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:42:24 2011 -0700

    typo

commit fbf160c16a018166ada8e7c5db91113774674e8a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:37:26 2011 -0700

    more review cleanup

commit 5d5df6b91e1aff46e3c33cdfa6e147499a83c048
Merge: 92350ce 85dd671
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 31 23:14:49 2011 -0700

    another commit from brad

commit 92350ceb065c14c85df71509164501ba03c95a5b
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

commit 66bbad19838ea1687e1a4001448be138f134a336
Merge: f31666c f286e36
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 df17b5295a32895d3e0162fc46b767c539c4389d
Merge: 458d5c7 689956d
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 458d5c79a6f1723c2db8d920d7f4e321d9ae05ae
Merge: c1db222 3a1513b
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 f64d1505c26925cad9acbabd68a055bd532a5ce5
Author: Launchpad Translations on behalf of nova-core <>
Date:   Thu Sep 1 05:02:30 2011 +0000

    Launchpad automatic translations update.

commit 3a1513b8bcdf291a508f1deb2064021c36d2e9a4
Merge: 4383f4f c1db222
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 21:55:12 2011 -0700

    merge trunk, fix tests

commit 689956d230486a7e227c98d9a02e586f80fce2f2
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

commit cd50282aa74b7f61010aaca4ccc9cd3da938d52e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:26:18 2011 -0400

    removing unnecessary imports

commit 5adb6f2ae231c3f550c752c6fcb2c7f9b5d92785
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:13:21 2011 -0400

    remove BaseImageService

commit f5634178126a0734cb59be55cdec6c8712c3e36f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 23:07:07 2011 -0400

    pep8

commit 1c9d1c7894e9f87df2f0330883557a9867f5a43f
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

commit 1cd61fb390cfff01f401a06b6f1d876923ebcd83
Merge: 616af4e c1db222
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 19:28:57 2011 -0700

    merge trunk

commit 85dd671188026ae326e76d0c4f309207533d0075
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

commit 7312731a1fb36c3647e96a26aeb50e1f033a4b27
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 31 17:30:11 2011 -0700

    Fix for LP Bug #838466

commit c1db2228acb8d6acb28dc153d69eb86b26edeee5
Merge: 22b2785 14d7090
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 22b2785bce6b2aac513131474ae4e27302311095
Merge: 8e808b1 45cf536
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 ba03e74979d826680ae38ddff26c4d7064eae1a4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 31 17:06:15 2011 -0700

    Fix for LP Bug #838251

commit 45cf536f1adf35f67d8a84378dafa94add080342
Merge: 10ee9a5 8e808b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 17:01:19 2011 -0700

    merge trunk, fix conflict

commit 8e808b1392133e7ddec759f8a29dcb80e509984d
Merge: 709019a 774e9d2
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 d134c2d971ba0b83b91b0be97959dde29fb66cfc
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.

commit 10ee9a56e17eddd4e5fcd067c04ec918be2246b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 16:13:55 2011 -0700

    remove extra test

commit 3c9523180062729a0dfa8208ac8abf331993bdc9
Merge: 7b34466 709019a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 16:07:29 2011 -0700

    merged trunk

commit 709019af8151349d8b73f20f857dd132d871d681
Merge: 192a219 87d8ffc
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 bfd1dd19f78b0b08c4159bcc283deb1fadbed0f3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 18:38:55 2011 -0400

    Updating test for <choices> xml to use lxml.

commit 4383f4faac31ba191b3f6fb637f52d13e9e42c2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 15:24:29 2011 -0700

    expect key_name attribute in 1.1

commit a54d6b5f3509053a2e831f5fae3160ac0380a142
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

commit 192a2191ec63043a957a3320c4b554b548498e1e
Merge: 38f1ae2 7ce940a
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 38f1ae290e5f93faa783f021926380c9d75b34dc
Merge: ada4705 f3150aa
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 14d70906db2562c9532fb1935a2ac00f5b3fec5f
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

commit 27bbf6a96ba90be39f697f56c4461660c8c1e918
Merge: 8e9affa ada4705
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Aug 31 15:53:56 2011 -0500

    trunk merge

commit 5f3572585dd15b726d5accf021ebc98675b56685
Merge: 122d5b1 ada4705
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 31 16:03:25 2011 -0400

    merging trunk

commit 807efa0e60d2710a3249f6f50b8f8842adbe3c98
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 12:51:16 2011 -0700

    fix keypairs stubs

commit f3150aa8bf93e92aca10582314f8db371cc34a15
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 31 12:44:15 2011 -0700

    add explicit message for NoMoreFloatingIps exception

commit 616af4e15d99715062303e28a774229c58c1ed37
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

commit b194b81a69c8057e0331b3870a3aea0a2cc410e9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 12:02:14 2011 -0700

    moved key_name per review

commit bcec08adc3c94b6f5b4ac4611eba71034f19af34
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Aug 31 11:54:30 2011 -0700

    zone_add fixed to support zone name

commit 7ce940a8db6920edc7e2d45dcf13ddea3696ebac
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 31 11:54:19 2011 -0700

    kludge for kombu 1.1.3 memory transport bug

commit 792fe39c9c95d7a98f21854b90991a43cd176819
Merge: e33e825 ada4705
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 31 11:51:19 2011 -0700

    merged trunk

commit 87d8ffc93177a9d21793c42ed4924a97c54bb094
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/

commit 4cd7dbc279ac646cb50a29370c68c89f88fdd637
Merge: f6f52fc ada4705
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 31 10:05:22 2011 -0400

    Merged trunk.

commit 48b58d456ba0e08f58c9b84d261da5b00dfb6b12
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Aug 31 03:40:42 2011 -0400

    Code cleanup.

commit 351fb24d73b4270d73194ef9e93304d8afb1f63a
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.

commit 9363aef374a09ad3c9ff8669128e2eb7158a1706
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

commit 0d34286b3cfcfdb5156c65c9664f1a1c41acf9cb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 21:05:43 2011 -0700

    switched default to kombu per vishy

commit 3a7b8ce39f308843f1e9e558d767bcf4f8faac6c
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.

commit 99d5e99c1da40e891acd27668e56362afa446ca3
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

commit a7e67fab77b9b2570d6d9457eb56a1dc7932e718
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 17:57:05 2011 -0700

    Fix for LP Bug #782364

commit adf6a1f9bd01227f568f41295a627310226b358b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 16:32:46 2011 -0700

    Fix for LP Bug #782364

commit ada4705c969e40f5314e38baff97b3bbf694ccb1
Merge: 2a4815e a8a42da
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 2a4815e3d5a1303acb1f7ccda93a38c9376606e5
Merge: 931c295 6565993
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 9f9af0ef7fa6b3d90e9014aba53f8d7faaf07a1a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 15:52:25 2011 -0700

    logging change when rpc pool creates new connection

commit 6b73eeeeda5702c95bcd96e7ad160dc6a5b9b62f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 15:30:16 2011 -0700

    pep8 fix

commit f6ca272f4997a94afd1a3c205a65f6be217f75c0
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

commit 774e9d28419b0b1d16790d59905db487638bb3c1
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 15:09:08 2011 -0700

    Removed debug messages

commit 582a3cc87161a1a80a3555eccb730de283248b43
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 30 15:05:39 2011 -0700

    Fix for LP Bug #837534

commit 741a3f1ae9d2585de412c64fc04d0075385e0865
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 30 13:55:06 2011 -0700

    add kombu to pip-requires and contrib/nova.sh

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 3fca0c4a6b4e0ec47488ed3bad1c96a9a977b32b
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

commit 7b34466c6877f7164fc06feba4345b3de77657cc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:41:30 2011 -0700

    fix remaining tests

commit 931c295834ca41dd1d6d7e7cd51e40f144ca6021
Merge: 7fc34f0 31244ce
Author: Dan Prince <dan.prince@rackspace.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 cb015012361d3dde315c2be38e37bfdf1cef27e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 12:14:25 2011 -0700

    pep8, fix fakes

commit ec1e364e38190397d84a8d9c9039ca2aafc06471
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

commit 647e0e6eada2b18a7363e79d22c655293356c5dc
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

commit 122d5b19f41f8f01438c84b62a9dbb05814fdb29
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:54:24 2011 -0400

    fixing bug

commit afe04440f946b87a5c0cdc6cf2b47b64b9c7085b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:52:23 2011 -0400

    fixing short-ciruit condition

commit a16a717dc3d8c58064c03b1d2741397bb443b91a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 14:48:02 2011 -0400

    yielding all the images

commit ae62b55caaf348f38fe50b87e572dbae01f8c3e9
Merge: b8ce9f6 7fc34f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 30 11:12:38 2011 -0700

    merged trunk

commit cf21fc0b382a6a0a73ff1f3163745a5af77fd63a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 12:51:02 2011 -0400

    changing default sort to created_at

commit 0c6748e63b4b29af6dfbbeac76ebf914d65b6ccf
Author: Thuleau Édouard <thuleau@gmail.com>
Date:   Tue Aug 30 18:27:48 2011 +0200

    The exception 'RamdiskNotFoundForImage' is no longer used.

commit 90b5710f53360bb3f4f34cda083f3da9a6f611eb
Author: Thuleau Édouard <thuleau@gmail.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.

commit af29ad27dc17c7aaa43044d6acca90a4441c917b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 11:44:19 2011 -0400

    adding an assert

commit 2747de8c97529024ec5396fe0fea6af4c3ac1d65
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

commit ffa7bce043577362d65a65826b7535831499146b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 30 11:13:25 2011 -0400

    supporting changes-since

commit f6f52fcd1000d7bbd1e6f37f0d55e5c6821611b7
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\!

commit 36fd602130f0d5ccf75bc59424a006c753c3c7ea
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

commit 31244ce0a8768db5b43ec50f25dcc241b1c45538
Author: Dan Prince <dan.prince@rackspace.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.

commit a91ca6e36a41e7273a5e03c4f340ad0ac0f6e96d
Merge: a149fc0 7fc34f0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 18:31:15 2011 -0400

    Merged trunk.

commit fd0d4374f2e7531dab3b4c7fa748c41068c8a4d4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:26:26 2011 -0700

    remove unneeded connection= in carrot Consumer init

commit 4747f351a7389db6776946454be57597452770fd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:25:54 2011 -0700

    pep8 fix for test_rpc_common.py

commit f1fcd261921f021a6083b0b3f93abe7d9ea2accb
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:15:58 2011 -0700

    fix ajax console proxy for new create_consumer method

commit 789ae57ce9bbb2d9156fd43f71fa5755f130f7a4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 15:08:32 2011 -0700

    doc string cleanup

commit 4055ecc6b9e6ba4d4c37b941195a32be95a8de4e
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

commit 443cc2c7ab96f4042be2d18b9397e5ebadbf545b
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(..

commit 7fc34f0cda4da0d9a30b5df7940ef781db1ec84e
Merge: 5d4696b 6830c39
Author: Dan Prince <dan.prince@rackspace.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 f31666cce6f107c0ae3a1b0e3c0adcfacba489b1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 11:04:27 2011 -0700

    remove brackets from mailmap entry

 .mailmap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit a83a830e05c0898a2756fc584f82c1ed3ddc5e0b
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

commit a8a42da1eeaa305469b5d0e94a1c0f0f71a16c91
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 29 10:27:25 2011 -0700

    more logging info to help identify bad payloads

commit 5d4696b49607e5569b0a587aa34edfe8dd860444
Merge: 43075c9 e32228a
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 c972bdc33b75810a12bc2b6c057a6c5e2ef49341
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

commit 598ee958a95b868c9cc37889e8a4da2c738dba65
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 09:03:56 2011 -0700

    add alias to mailmap

 .mailmap |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e2ba8f7357a9be2b5ea19fb0bb33720023cedf63
Author: danwent@gmail.com <>
Date:   Mon Aug 29 08:33:12 2011 -0700

    update file name for db migrate script after merge (again)

commit 88b4993869c8037e5fef4cedf53da6c90cce82ea
Author: danwent@gmail.com <>
Date:   Mon Aug 29 08:31:56 2011 -0700

    update file name for db migrate script after merge

commit 1ea2eb2458d25929f1d6632e32b11d7269dddd34
Merge: 0a16fac 43075c9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 08:07:34 2011 -0700

    merged trunk

commit 6565993886217e20ce80ea5732fcd604174a0e19
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 4ba6563a44d7efc3f66852ed828b68dc5aafe01a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 10:13:39 2011 -0400

    Removed test_parallel_builds

commit a149fc0e22a8caa46d5aa8ac0a7a1c886bfa3cf4
Merge: 8361a05 43075c9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 09:45:41 2011 -0400

    Merged trunk.

commit 8361a05a8a4f2300abc3035a24e869412c593af8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 09:45:00 2011 -0400

    Increased migration number.

commit 43075c9cefbb630939bedddb3df532e379fb12af
Merge: e71b289 94b70bd
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 155903e870ef170f62fd1a03d24bbc7ffc02e78f
Merge: e35cd8a e71b289
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 29 08:34:40 2011 -0400

    Merged trunk.

commit e71b289bdbea1babee392670e03b36e20e961d03
Merge: 992f1a7 a2092b1
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 a2092b1ba22bad6d7ad445c24266aa717cade8d2
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

commit 94b70bdc75375abfd67b57e7e5ef89bc5e91de02
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 00:50:17 2011 -0700

    removed broken assert for abstract_scheduler

commit 0a16fac856575a1baf6c987612b30362ef85a91e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 29 00:12:30 2011 -0700

    pep8 fixes

commit c5eab3a0d05ad6fb8f1d2e40fad9a956ea41bd48
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

commit 637caa0425534cc227da787d5d6ab75e980acedb
Merge: 47499d7 992f1a7
Author: danwent@gmail.com <>
Date:   Sun Aug 28 20:06:55 2011 -0700

    merge trunk

commit 47499d76c1fc4327674536932d179a21688c7de6
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

commit e41edd88950455a60a46f8f4f9873fef2f5fb3ca
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

commit 531903c1d7dbf7affef02f6ae362e3a58400a7db
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 19:23:31 2011 -0700

    carrot consumer thread fix

commit 84346dd85cd4606237078fbc8c7e800fc84a42d8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 19:22:53 2011 -0700

    add carrot/kombu tests... small thread fix for kombu

commit 16aab628ee907e76a5b1f1c4730b01664ccb1e69
Author: danwent@gmail.com <>
Date:   Sun Aug 28 19:13:02 2011 -0700

    add doc-strings for all major modules

commit 5bb0a98f2a215c0052907ca4db2e7f529bc686fd
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

commit 6830c39e69f55a817ae35e646019abd6d384dce2
Author: Dan Prince <dan.prince@rackspace.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.

commit 615131661d86b42bac456629b93f05599b6b2868
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:19:41 2011 -0700

    fix nova/tests/test_test.py

commit 577875492585aad45fe320e3c2ebba6796d501a9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:18:40 2011 -0700

    fix nova-ajax-console-proxy

commit ebaecceccdae8dc0ccb85725fcb77d1c6a0dc3b8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 18:17:21 2011 -0700

    fix test_rpc and kombu stuff

commit 7ea8da4101ef613c6689db60d122413430e817c0
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

commit 2179403e771b71bda1da76a096db0023d133c2fa
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sun Aug 28 17:33:11 2011 -0700

    start to rework some consumer stuff

commit ea7039fdc6484441c2e03ff37d34efc6da1e4720
Author: danwent@gmail.com <>
Date:   Sun Aug 28 15:39:27 2011 -0700

    update melange ipam lib to use network uuid, not bridge

commit 8aefb184933640409f45344a7f76e00e8cc21689
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

commit 992f1a7cd3f301385142e6b16a7321bd35d0b473
Merge: 264c9e9 f7cc7d8
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 e32228a29f24e1f60367c55b8b80ba4bbd031e8b
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.

commit 295dee6a407e0a4a1a7adb9bd17c8be227e358d3
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

commit 264c9e9a05bc9c80e1f2202241cc62b830ad5746
Merge: 9b5976b d7f3814
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 5e2618a8136fa4bf7463912be52b48cdee6668a5
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.

commit f7cc7d8d05f114b98467b55b69cdceea30894614
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 files changed, 10 insertions(+), 8 deletions(-)

commit d7f38146ea8de92c7520aafef9447962378662c1
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.

commit 9b5976b923997be4261b4bfe91fae4f0daf649a7
Merge: aa986e3 2d85ffd
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 32c4fd67d5f8d70a614c090db7c7c95c80788e57
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Sat Aug 27 21:33:14 2011 -0700

    fix FALGS typo

commit aa986e38fce7f0505442c85fb3854b38c6ea047b
Merge: 0698d0a 0d5f186
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 136b8806abcbdaf506b4526e3ad925082f9e315b
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

commit cdc9f8d08681780aa911ea32abd4aa0b5472d3b5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat Aug 27 04:32:20 2011 -0400

    Updated VersionsXMLSerializer and corresponding tests to use lxml.

commit e33e825d2386845d555d4c2d3b35a857891da17e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Aug 26 17:46:47 2011 -0700

    v1.0 of server create injects first users keypair

commit 4f95452c89ff55d6375f6eded27f6e30f778c237
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

commit b8ce9f69f429f5c1587766b199a9c22f387f49e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 26 16:17:40 2011 -0700

    use db layer for aggregation

commit 962bf46080bef950cc62bbc7c7326c01abdb6693
Merge: ded02e7 e22e5e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 26 16:16:17 2011 -0700

    merged trunk

commit 938d25dd723bf9e7dd308c07dab176541d2bb854
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 16:04:34 2011 -0700

    flag for kombu connection backoff on retries

commit 485954e2b38f13354ee73e0483a99cdcbdb37ce5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 16:00:50 2011 -0700

    more fixes

commit 7a3e077ea3ec2e5b4b6602122c168a2d4591a14a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 15:59:15 2011 -0700

    more work done to restore original rpc interfaces.

commit f733553ce4aeedb2149a29664d2216a750732483
Merge: b29c397 f8556d0
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 f8556d06fb07d418ada5aa7ace2715d8bf5d7708
Author: Brad Hall <brad@nicira.com>
Date:   Fri Aug 26 15:48:53 2011 -0700

    Minor changes based on recent quantum changes

commit 0e325c0d2215e88ae6ff4860e50345c93e4f63a4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 26 15:40:04 2011 -0700

    start of kombu implementation, keeping the same RPC interfaces

commit 0d5f186fec473bf7045b7070256eb7b8ac335d0e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 17:32:44 2011 -0500

    doubles quotes to single

commit 2d85ffde868a6cc7bc36fbe80a9f2c887fc016ba
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 15:07:34 2011 -0700

    changed format string in nova-manage

commit 8e9affa7ad8e9116325541479349d7105801611f
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

commit 067435fd3246e7ac71d6d593fb24eb262cb5b84a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 17:00:06 2011 -0500

    updated libvirt test

commit a523cd299becc5b00616f0e8aefec747b013e4c9
Merge: 87e3654 0698d0a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Aug 26 14:57:53 2011 -0700

    merge trunk

commit 91c15674857bc9b0c8ad7b33030873babfa208a5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 16:55:52 2011 -0500

    stubbed some stuff in test_libvirt

commit c428ea0dc19bec9efdba76edd9b5b6153c160221
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

commit 111609a0f2e2771c25157817443725b4dbb62a6d
Merge: 6e24b4b 0698d0a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 13:36:45 2011 -0700

    reverted CA files

commit 1bfdf499bb1ea2ce75f49831e2b390812865deae
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 15:09:39 2011 -0500

    couple of pep8s

commit e35cd8a374781778eb32424bef0b6c0c8d52c9f7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 26 15:36:33 2011 -0400

    Tiny tweaks to the migration script.

commit 034da2d33343b6f27bf2302a14947246f396de39
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:47:54 2011 -0500

    updated fake values

commit 776bb9c62f0051db54d686c05198d99635c63e65
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:44:26 2011 -0500

    updated fake values

commit 5834e5ccb023fc4d83b24eb8cdb1124252d82af0
Merge: 019a9c2 0698d0a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 26 14:43:27 2011 -0400

    Merged trunk and fixed conflicts.

commit bb97e04a1cff7fe9a9a3c37d4047acb6f6fcd7c4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:37:25 2011 -0500

    updated fake values

commit 963bbfeebbb1936656bf7e3fd7912417b5f1ead5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:32:16 2011 -0500

    updated fake values

commit 34bfc5ce59f608ec06ebcf567a2e6117dbbabc51
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:28:17 2011 -0500

    forgot )

commit 9ad4c8a6619de506e7eab11403acae78d056a390
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 13:26:33 2011 -0500

    update libvirt tests

commit 0698d0ad5c3b5d5d0802836ed8db26cd9818597b
Merge: b116d7e fd4ee5d
Author: Dan Prince <dan.prince@rackspace.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 6e24b4b141a3cd5a8daf3b239d8686d5c550ced5
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 26 11:14:44 2011 -0700

    added debug prints for scheduler

commit ca7ff585965b5e0ff0b39500abc8948bfca53b93
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:38:20 2011 -0500

    update libvirt

commit c69d6761583aa6d0a72d60c54f64aeb8d4fea0b5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:33:08 2011 -0500

    updated instance type fake model

commit 8673d5a8f3091134e29bc3ce8d5814fdae98099c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:29:44 2011 -0500

    added vcpus to instance flavor test model

commit 7fe0125d0f0c6ac61f8119bcf323b93ab95196b7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:28:14 2011 -0500

    added memory_mb to instance flavor test model

commit 8743c0493d3fb97ec144f6d69ecaeb2054e20df0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:26:09 2011 -0500

    forgot test print statements

commit d13324d8a20349a9ccfee49fc206a31597f74bf8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 26 12:24:35 2011 -0500

    misplaced comma...

commit fd4ee5d79269563f0da385d5d746e1d1e53d67c9
Author: Dan Prince <dan.prince@rackspace.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.

commit b29c397a2c458e5d5ddcd065d826fe74583ce249
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:18:38 2011 -0700

    Add brad to Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 930c9f86932478dc8292759b794f8f6fefc22986
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:08:15 2011 -0700

    replace accidental deletion in nova-mange

commit 448c85e5b681243283d79d12bddbdb144790eb10
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 23:02:46 2011 -0700

    rearrange imports

commit 61486411df3dee9c25d3f285e8e164a25960ef22
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

commit 1d5219031c007a159bf485743f3eab9bdf310b2e
Merge: eb8b3d6 7b63768
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 21:11:27 2011 -0700

    merge brad's fixes

commit eb8b3d63aa6109afa00e6aea0c9e9c47ce9dbaa0
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 25 21:09:15 2011 -0700

    add priority for static networks

commit 467e18c732bf51bd88a9dd345d4cecfb7fced6e4
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:47:12 2011 -0700

    driver: added vsa_id parameter for SN call

commit 66e24fd457973d01e30ee92fcdadac7931cc0b74
Merge: f1c1d62 b116d7e
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:18:46 2011 -0700

    merged with rev.1499

commit f1c1d6243babfda610811b3350dc9cc0a7adbec4
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 19:09:50 2011 -0700

    cosmetic cleanup

commit 0e043ffd83f0e5e8dd0367c71941a19b0a2cddc9
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

commit 6389c352ec7009db2b8d2340ca6515cb12285965
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

commit bbb51bf216ab7fccaafd38dd6fb9fe3434ee988e
Merge: 55402d2 b116d7e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 21:08:17 2011 -0400

    merged trunk

commit b116d7eabc9f3c1071f1df834c11d23ffb613204
Merge: acc9891 7326809
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 7b6376862997bb8621f2b95d0733d9e87d1d23c6
Author: Brad Hall <brad@nicira.com>
Date:   Thu Aug 25 17:13:09 2011 -0700

    Minor fixes

commit acc9891b9231bd98d9f45fa1f228596896a4f015
Merge: 397a9dc 17e8b4d
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 397a9dcfacf3c4cf572c9a34acd843d4fc4d3dad
Merge: 096c7b5 695b853
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 096c7b5b3e51615919828e786718f73c5d68403a
Merge: e22e5e7 8c9333d
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 55402d23f0ec3407a289d4c7a4db6263bca4ab12
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

commit 695b85398e9b4dcc43f5e1fc4a414dd96f8cfe50
Merge: 844383c 99fbbc4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 25 15:22:51 2011 -0700

    merge underlying fix for testing

commit a8ac20e0da119b142c637dc22a9d4d0db479a100
Merge: a244b88 e22e5e7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:11:04 2011 -0400

    merged trunk

commit a244b885ea6407be445d1b1cdbdd8c9807e8c0d7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:10:43 2011 -0400

    updated additional limits test

commit 7b1b7102efe80eff72b4dcac1fac3e5c066d4847
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 18:08:46 2011 -0400

    pep8

commit 844383c6d5c571b40a1dcd237f3dd1a7a314e14a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 25 15:08:28 2011 -0700

    pass all commands to run_iscsiadm as a tuple

commit 41306b71af957ceab2cb50f5f731020127bd5625
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 17:04:26 2011 -0500

    altered fake network model

commit db166961465741370be0f868053c498dcca69419
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

commit 019a9c2cf7b4bca99781151da472342b8bee6972
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 18:00:32 2011 -0400

    Test fixup after last review feedback commit.

commit aa9e7ceab26fe66bb420397848af69df7b1fce63
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

commit ccb0139d68c0214fe693403755eb321f01fab9b3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:49:09 2011 -0500

    forget a return

commit 68ac03d0034f391d73004d35c738111374149ba1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 17:27:10 2011 -0400

    review feedback

commit d89a5222530b4060df340072e4cd11b9211e45f4
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 17:10:35 2011 -0400

    Fixed integrated.test_xml to be more robust

commit 530556ae7ff50b9b9e19bbc440a36995a4b2f804
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:10:25 2011 -0500

    typo

commit 16959a0f66a0eef9674f5b2898acc192f36d3759
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 16:02:52 2011 -0500

    fixed a couple of syntax errors

commit 8c9333d24a90ef310e5971b0da239b4355ecb4eb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 25 22:56:59 2011 +0200

    Add bug reference

commit 8f2866cd7f6c8aac1cfdfd0cafd603d4a61ad656
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 16:56:21 2011 -0400

    updated tests

commit 08261099e917f3ff5c63d55d1370fd2cd11c2078
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Aug 25 15:53:13 2011 -0500

    updated libvirt tests to use fake_network_info

commit 876c853902c275cb09f3be5a3629e6722e389070
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:40:15 2011 -0400

    Bumped migration number.

commit 1bcf10448c8ca0d606908adab43a42ddb9d9993f
Merge: 534430d e22e5e7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:38:57 2011 -0400

    Merged trunk.

commit 534430dafef53666b7256e756abf67344a4efb4f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 16:38:38 2011 -0400

    Review feedback.

commit cab861d164b46cb718db57c2b2e69b2e3dc5aeef
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 16:36:41 2011 -0400

    pep8

commit 7787df7f07cf7a7507a23ad26b23996bf6549214
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

commit 477cb08eda7a0bb7c2a5bf1c120ecbf3e9c38bdc
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

commit 0222255814b6161b5c9b7a61e6c2fea435c63eaa
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 15:12:34 2011 -0400

    Added addresses schema

commit 08a405dc07d0dad5970a40d9d30c555fc6eddbd2
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

commit e8f82dc621d936dc57d147977405132a27223e56
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 14:58:31 2011 -0400

    Updated ServerXMLSerializer to use etree instead of minidom

commit e22e5e7a2b4fb7252696307cf18e5c4755b773e9
Merge: 76c4cd1 90dc64c
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 37cf5837d285543794f1381e2898948cfe9d5b96
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 12:50:36 2011 -0400

    Reverted two mistakes when looking over full diff.

commit e7a431e267c82659f5b593ba7ea60827a3c02619
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 12:44:01 2011 -0400

    Updated MetadataXMLSerializer to use etree instead of minidom

commit 76c4cd14858e1037eb704e891e1f69d89acc6c02
Merge: b2feb80 b5f0b59
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 3f36f9e51076a6616fb7c160dc046c9cc0360d32
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

commit b2feb807fb0418c10bea56a7a66b13694e1ddec3
Merge: 4fff100 de8d6fb
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 17e8b4d66dbd6e0d6c39e4e3e6b3b552f6ebf242
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 25 08:59:21 2011 -0700

    moved import up

commit 7e43dc392d2ae54e29630ba346c017395cf62812
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:44:28 2011 -0400

    Verify resize needs to be set.

commit de8d6fbdfc44fad5849bae294af6d4cfa60c9b68
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 25 11:44:21 2011 -0400

    changing comment

commit f62d8496c2d39ac58e5c907d50660313007f2c31
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 25 11:37:17 2011 -0400

    fixing bug

commit a7c267daa016afd374198f7fa1b063e98fedc901
Merge: 548eef8 4fff100
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 11:25:30 2011 -0400

    merged trunk

commit 548eef80412a2c6d4c2d3cff154c901e418d6b17
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 25 11:24:25 2011 -0400

    Updated ImagesXMLSerializer to use etree instead of minidom

commit ff63567a6c9a0f3517772ae65ebe1bfdf5d033ba
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:17:31 2011 -0400

    Set error state when migration prep fails.

commit 40cabed89d07e5a0cd6ec3b50eb57d8deb75c813
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:12:53 2011 -0400

    Removed invalid test.

commit 9c2fec7b5caba635299df5b0c1447af898bb48f0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 11:11:51 2011 -0400

    Removed RESIZE-CONFIRM hack.

commit 22bc3b28fb2cbc220628f508116a090dd90358e0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 10:59:04 2011 -0400

    Set state to RESIZING during resizing...

commit 2b53d3612ac1972b8600c8018318ae836705180a
Merge: 0951f75 4fff100
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 09:04:20 2011 -0400

    Merged trunk.

commit 0951f75a3b1568c7e388fbab7f6048527d9047d1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 25 09:04:04 2011 -0400

    Another attempt at fixing hanging test.

 run_tests.py |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 4fff1007758e1d398197ac64ecedb9ce9305db83
Merge: b4786d7 8a13c3b
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 b4786d755b3bde79943b52f8260f2c046eab6d6c
Merge: 46ab49d 162e57a
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 25 08:08:36 2011 +0000

    Update paste config so that EC2 admin API defaults to noauth.

commit 360e83a1fbda312aaed1e0c674c9e50bf0171fa0
Merge: 0d0e366 b5f0b59
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 0d0e3661d13b9d16c669e56205d65e6efd38a0c1
Merge: 2855665 70c7da5
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:48:04 2011 -0700

    merged with volume_types. no code refactoring yet

commit b5f0b59426790959885020db7e1c369968292bd4
Merge: b6c8a73 46ab49d
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 16:42:32 2011 -0700

    merged with nova 1490

commit b6c8a73295494b8edc6c1c24bdcab96e83ac7264
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

commit 90dc64c95ae58282d5db29fd4eefc606eb4348f6
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 16:03:32 2011 -0700

    removes french spellings to satisfy american developers

commit 2855665165e9889ea8586d3f94c8ad757edf932b
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

commit 3cc9c94f5048c2f782d3592edf7bdeff543c01f6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 18:25:21 2011 -0400

    stub_instance fix from merge conflict

commit 845fc87d119b75068d8dbe25a92c35c20ef93e49
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 15:20:37 2011 -0700

    moved import to the top

commit f6d716baf6801bc9e18efb72f98bd67a79253b67
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 15:18:17 2011 -0700

    fixing inappropriate rubyism in test code

commit 532d517949f9371e78cefa5e767fc45fe7c0b174
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 18:14:13 2011 -0400

    Added fix for parallel build test.

 run_tests.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 24146959bce1b843c10fd48e4398bb5ca92c6e86
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.

commit e3fe2ee6690d20829f90cf3a2c816f7479b53eaf
Merge: 9b81d70 46ab49d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 17:41:39 2011 -0400

    merged trunk

commit dbfda946a1ee9cebec07eba093415b493270fdb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 24 14:39:47 2011 -0700

    change snapshot msg too

commit 70c7da5dcefe0dd19839fa4abbe526f012f06954
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 14:30:40 2011 -0700

    forgot to add new extension to test_extensions

commit 7326809ef78e7d4b2ccc366d22084578aac4071d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed Aug 24 22:16:02 2011 +0100

    Add me to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 9a2eb00f47080604c2e4568faa090233660eec37
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 14:07:17 2011 -0700

    added Openstack APIs for volume types & extradata

commit 8a13c3b1c7f5d5feffba30b85ac1694ce5c810ab
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 14:01:33 2011 -0700

    Add comments for associate/dissociate logic

commit 5a51ac080934557287a580f87148348ae16eeefd
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

commit 509c7d02b93e30dcd595ea1c6f1dfb8a814b65e2
Merge: ad9cfab 46ab49d
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 13:11:41 2011 -0700

    Merged from trunk

commit ad9cfab712a846eee9a3236cb6a03c47f556ef0a
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 13:10:56 2011 -0700

    Add names to placeholders of formatting

commit 46ab49d94ff771dce38ec258376576045ab9cafc
Merge: d02b0c7 77fc0f1
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 d3edc3a2961b50797742f647eda11e6e692649b1
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

commit 7033354330a40896b5feb7be4ac9cb930b35243b
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

commit 18c7b8c5bb20924dfc5d00ef9093b9619ff38f72
Merge: 621b081 d02b0c7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 24 11:45:12 2011 -0700

    merge trunk, fix tests

commit 621b081451845e72a34765900d9002b13ba29ea3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 24 11:36:41 2011 -0700

    fix more tests

commit acbea455c307bc8adc691fb7ca90553769959a97
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 11:10:05 2011 -0700

    Removed unused imports

commit 541c1181bb7acde041edbb4e4064b691fe84196f
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

commit 4b3cd4cab55c75c00b2c1a49a5663795680aded1
Merge: 7f8163e d02b0c7
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 10:47:46 2011 -0700

    Merged from trunk

commit 7f8163ee9d0f7f361e4c180cd345f895990da63c
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

commit 9b81d70da346c7134e8ec45d75594df4afe888a9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:27:23 2011 -0400

    Added DELETED status to OSAPI just in case.

commit d02b0c711c9a110f9298a7a79b71dad2ee559dc3
Merge: 8aa29e6 99fbbc4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 24 17:24:52 2011 +0000

    Fixes iscsiadm commands to run properly.

commit 00e37422656b00d4da8fec91ec9488ec3253153e
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.

commit 5b077fbbe6a7fb6d4c6bbddb4f69e0495f8d43bc
Merge: a6c6b47 8aa29e6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 10:20:27 2011 -0700

    merged with rev.1488

commit ea31df396068849fc460713eeb400a00aa83d996
Merge: 0fce774 8aa29e6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 13:16:37 2011 -0400

    Merged trunk and fixed conflicts.

commit a6c6b47156d66c940d127c4ccce88c2b5dfce761
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 10:16:20 2011 -0700

    added volume type search by extra_spec

commit 0fce77494949a8de0851b53239c3e89af659d2a1
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.

commit ec338a8d7c67533f20fc8117fa0a2408ee9dd8c9
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.

commit 5fce5fe843bca02eea2525abba758fc345b02cc8
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.

commit 8aa29e6ce9e592f4cfbd3817a02c188776cf6846
Merge: 699d6ac e1e93f2
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 329b893bd1ce7a4ef82cdb762b00d797ac9100d5
Merge: d14a200 699d6ac
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:20:54 2011 -0700

    merged with 1487

commit d14a200319b7ee5b9119418ebe4e071d0e90725f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:18:53 2011 -0700

    pep8 compliant

commit e23cf1e80a4044472c65703627e6512b5587f73a
Merge: c25dfd1 699d6ac
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 09:17:33 2011 -0700

    Merged from trunk

commit 699d6aca53c76a1db187b0dc4dfccc706ddd78ab
Merge: c52129b 3366064
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 c25dfd123db8ab7a309f25e4e1593e2d8e985cf9
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Aug 24 09:11:57 2011 -0700

    Fix flag override in unit test

commit 66fd801df1d051dbb241a908d4ac88f24a711fa1
Merge: bc3c657 021d97c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 09:10:28 2011 -0700

    merged with rev.1485

commit c52129b5396ea4c2f5285d4bdf9e8a45d9d99ce8
Merge: 021d97c 408dbef
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 e1e93f20eab89d020bb764ca5a2b0cd6d54c5202
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 24 18:01:29 2011 +0200

    Let's be more elegant

commit 021d97cc81562781b17e811f44d0a6fb97ea6d9f
Merge: df48bf3 92c524d
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 702c4b736c2906a6e379cb5ffe97e0d1e5322075
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 24 08:51:14 2011 -0700

    check log file mode prior to chmod

commit df48bf3f610a2b6274c157ee09b9e3eec475ba39
Merge: 2f5d2f7 ae084ea
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Aug 24 15:44:52 2011 +0000

    added unit tests for version.py

commit 6860f58d26906f3a89d74c7f2098a40ab71eeadd
Merge: 4306a49 2f5d2f7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:33:18 2011 -0400

    Merged trunk.

commit 4306a49b8863f1522ef5a1364c98369e197fc136
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:32:58 2011 -0400

    Fix for migrations.

commit e2542bccee1176584b7cc92c9cd42f311b1de3f9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:27:02 2011 -0400

    Conversion to SQLAlchemy-style.

commit 3366064db6f75938932856e0f0a0f138c4665faf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 11:11:20 2011 -0400

    dict formatting

commit b2b4ad17cac002584ab08592a1ef54d10b16c71a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 11:00:21 2011 -0400

    Commit without test data in migration.

commit 5c6a4269de725cabbafa049ef421ac3d5f7f444d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 24 10:59:12 2011 -0400

    Commit with test data in migration.

commit 5996252ac9174a063ba081b906300568f1d9c3bb
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.

commit d0da4cd2281058e98375e388e313fb56a0c19d51
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.

commit f256dfe4677103129d3bac09689d54136a9aea96
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.

commit 9cfc949b8632ebc1e6a0fd49812dc1673d8dbd31
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:45:53 2011 -0400

    fixed indentation

commit 34c67a335f75a6168fda9c7285c8b6c2aaff7ba9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:37:59 2011 -0400

    adding xml serialization and handling instance not found

commit 774f6ad5ff2248d3dd4eb41665fdfe22c0164a4e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 10:06:20 2011 -0400

    removing extraneous imports

commit bdfe98f4539330a390af42250fe143457b4fcdaf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Aug 24 09:38:43 2011 -0400

    pep8

commit efb9f536cd61a0a4ba58fae2e43df991bc9bfc64
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Aug 24 14:42:30 2011 +0200

    Thou shalt not use underscores in hostnames

commit f286e36a335b63ba84183a4820c76c392a0b773e
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.

commit 4030872fae277badf3d120514ba0ac3f5aec45c4
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 24 03:07:11 2011 -0700

    pep8 fixes

commit bbee4ae5b84969244fda8f0515fc7fe1e5de25b6
Author: Brad Hall <brad@nicira.com>
Date:   Wed Aug 24 02:11:56 2011 -0700

    Couple of fixes to the review feedback changes

commit df01087fdae67cf4d84f1ff4c49e62f14fb53a32
Author: Launchpad Translations on behalf of nova-core <>
Date:   Wed Aug 24 04:47:59 2011 +0000

    Launchpad automatic translations update.

commit 40f017437debc5e47f6a7d5c0b7f0020d91b46ee
Author: Brad Hall <brad@nicira.com>
Date:   Tue Aug 23 21:18:47 2011 -0700

    Address code review feedback from Rick and Matt

commit ac34edeb309dae356eb0059c4b0a8998d98dcb63
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 23:27:36 2011 -0400

    removing print statement

commit bc3c65738ce3e450108e95f18135be0044321729
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

commit 162e57aff92bbf5ef98defd5cf015e3fd019a6e0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 23 22:43:10 2011 -0400

    Update paste config so that EC2 admin API defaults to noauth.

commit 3002e8a41585b83822ce928007af18f4bd3b5bf9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 22:00:42 2011 -0400

    cleanup

commit 750fdbb925e54bf755f0693faf77847aeeb5179c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 20:59:24 2011 -0400

    updating tests

commit 99fbbc47ea5f3b8bcb0e3258425d3962e3a8b3b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 15:53:59 2011 -0700

    fix iscsi adm command

commit 18b23d2272740a0e7471ec27d3ff55045e7c2d81
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Aug 23 15:40:28 2011 -0700

    Fix pep8

commit 03c550b4cf32e75c4e4364fac84c68dc69f4adaf
Merge: b40528b 2f5d2f7
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Aug 23 15:32:44 2011 -0700

    Merged from trunk

commit 9b6a42d1b8f848cb197834e4c4f3889f3d99b2be
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 23 15:18:50 2011 -0700

    added volume_types APIs

commit d55f4ba70805b915322bc1cb7a8e8056e522a4fb
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

commit b40528b0a851457eb51659f70df1fee93c017f45
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()

commit 4ead2e563cf4dc98df20b1fcd29198bf2bc85643
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 17:31:19 2011 -0400

    rebuilds are functional again

commit 2f5d2f798ee135b9099a40aef1ce0f8f76113afe
Merge: 13ec4f2 a429d55
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 77fc0f18da1e6a324425520eea0a2a3395d299e3
Merge: 5970ee1 13ec4f2
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 15:51:39 2011 -0500

    Merged from upstream.

commit 5970ee10aa1dc5472063e9c8cada1bbc0d9f337e
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 15:50:39 2011 -0500

    Fixed some pep8 and pylint issues.

commit a429d5536f7f0120788f6769a69adb2b142e43fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 13:44:21 2011 -0700

    Forgot to set the flag for the test

commit 13ec4f2bf6a3cedf183eb5e0c31695d0ed8bf244
Merge: ee33e5b 37525ce
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 ee33e5b2c7ecbf8e93bba42c2640ff20f197a16d
Merge: d86db8a 3ae93e5
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 830705b9353fc32ffd4af64c28222079a0e55eba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 23 12:21:52 2011 -0700

    fix for rc generation using noauth.

commit 37525ce8ac0da4856d09275a0dd861ca0a27fc00
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 12:06:25 2011 -0700

    Fixed doc string

commit eec7a4cc7f32c9d4f36f3f7eebdc22c1a332b160
Merge: 20ea159 d86db8a
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 23 13:16:04 2011 -0500

    Merged from upstream.

commit 20ea15972ce22da924b513be06f1f67021402177
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.

commit 3ae93e50ad1b1bb478423a8e034780728d740051
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 13:44:39 2011 -0400

    updating tests

commit 9f58464bae1bb17754a88ec35f37f2f1656b996b
Merge: d85598f d86db8a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 23 13:08:42 2011 -0400

    merging trunk

commit 64f90b70ef5d4cf6854f82474c523c183a8434f8
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

commit cbb99c916dc5bca4752cbdb993d9da70ba91823a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 08:51:44 2011 -0700

    Removed blank line

commit 6ed407b233080d646247e0d0840cafd44e758ab7
Merge: cfcf15a d86db8a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Aug 23 08:46:55 2011 -0700

    Merged with trunk

commit cfcf15a93d4505d4e44df7b1a7e6fda283a62dd8
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

commit f39fa1c72088ad7cd338484855464d15c6f8201d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 11:01:57 2011 -0400

    Updated migration number.

commit d86db8ade743c39b926e00b23b95126eec9582aa
Merge: 99eae5d 7ab14d1
Author: Dan Prince <dan.prince@rackspace.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 e5b73e1959f565637e653ec072453f6351b88e74
Merge: a14ed16 99eae5d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 10:59:17 2011 -0400

    Merged trunk.

commit a14ed16fb5ed085992c83fb52c3db555a50aa1ba
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 23 10:57:47 2011 -0400

    PEP8 fixes

commit 7ab14d1b13a1ccc24d94f2b82fbbcf54e9c87e3e
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 23 10:31:34 2011 -0400

    'use the ipv6' -- 'use ipv6'

commit 4bfd3deb34fe482619da40bb6d2dd1827a401065
Author: Dan Prince <dan.prince@rackspace.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.

commit 99eae5dbab88c0a2195a3f9dc7384947f129241b
Merge: c85df6e 99c9533
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 23 10:35:08 2011 +0000

    Refresh translations

commit f85d7bbbb0e5ead43daeba20897749e783cf7478
Merge: 551f17a 0238972
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 23 09:55:15 2011 +0200

    Merge generic virt-driver tests.

commit c85df6e98e1d9d0832d7642247d3af7032de3383
Merge: dba2171 152867e
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 dba217184d49a02dd0c358ed88e9890544a1a3b2
Merge: 3b45738 516e421
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 43fd607a83250b4eafe57d0ee85dcf3134abe77c
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Aug 23 05:21:47 2011 +0000

    Launchpad automatic translations update.

commit f114b1ee67720cc80af2de8456b7d40d97c14f77
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

commit 516e42172dc527bd0a0dfe02b9d9635e25707920
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 22:17:51 2011 -0700

    Moved migration and fixed tests from upstream

commit a5c65e502f370d8337b6839b239a6b97192518f3
Merge: 3b45738 1658f53
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 21:17:57 2011 -0700

    Merged trunk

commit 1658f53433fa98967fb4792bcb8212b82c745893
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Mon Aug 22 21:06:47 2011 -0700

    Added the fixes suggested by Eric Windisch from cloudscaling...

commit d85598feb37a38b2ff15e2427ac945dd36cf10c2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 23:30:12 2011 -0400

    removing unnecessary tthing

commit 96bfc57c08a2987bd186547443db22c0bf397a8a
Merge: dd8c872 3b45738
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 20:05:08 2011 -0700

    merge trunk, resolve conflicts, fix tests

commit 152867e589f37a6288552090077f96048837fea6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 19:25:22 2011 -0700

    unindented per review, added a note about auth v2

commit 3b45738d52d40a81aee3dcbf0e69030e5501a55a
Merge: acc21eb 46427e3
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 516087424e44fcff484f1a6ed527dc6d10bfb6c4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 22:00:13 2011 -0400

    fixing exception logging

commit acc21eb46f5fd5e990066c2ff5a4f61cf9dc26af
Merge: 7f79177 9a44036
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 7f79177187882b38a0de9eb64507f818890b12cd
Merge: bf1739c 551f17a
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 74ef4bd6da14e8bf8d8f31a56a2070b9eb51baa8
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Aug 22 17:31:48 2011 -0700

    initial cut on volume type APIs

commit dd8c872a8b360e26ff11cdc80b216fd401f49780
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 17:02:54 2011 -0700

    fix pep8 issue

commit 2eedb01aa61327e6fea40b32547103896fd127e4
Merge: 30e3625 46427e3
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 30e36253bc64d063ca8041177c583100d601de4d
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.

commit 46427e37975476ab28b2f103eb8e792d0b7c3c03
Merge: 1de13d2 bf1739c
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 cf3eed0b2f1f3108d12d2e40e8adfee26e4fff56
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 16:21:29 2011 -0700

    xml deserialization, and test fixes

commit 02d72cf5ff4278356dfb7fae8ec26ee7308b5500
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Aug 22 17:52:54 2011 -0500

    syntax

commit 0eec3694530583499e1b91a7e209c93930db042d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Aug 22 17:46:47 2011 -0500

    update test_network test_get_instance_nw_info()

commit ded02e7b259f2a73f6d369f8d9a60e1b95975d85
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 15:21:31 2011 -0700

    remove extra spaces

commit dd9036b43c5f3b58b72a2fb10bb55100274845a4
Merge: 60fe4c1 9c957bb
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Mon Aug 22 14:45:18 2011 -0700

    Fixed conflict with branch

commit 9a4403667c6e495c735da925a1def39813171fc6
Merge: a5baf79 bf1739c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 22 17:35:43 2011 -0400

    merged trunk

commit bf1739cbe7ed9a7bba8902c411b26746f31b9b5c
Merge: 9c957bb 1883851
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 ba47fd65f63accd5c32bf04add68525279d04bbe
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 22 14:31:26 2011 -0700

    some readability fixes per ja feedback

commit d569ba6e956fca54688fc085f148c9fb9f3eebd1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 14:26:41 2011 -0700

    fix comment

commit 0238972e3495c2d13aa8a34fe81ecf8f49548fd0
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.

commit 7687f2930482a14c1bd1cd580aed48fecec33242
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.

commit e4f52ac04b3183c2377c25aac9109dce76d0353c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 14:24:59 2011 -0700

    change NoAuth to actually use a tenant and user

commit 60fe4c19214bf24a80f45ac3b5c91f8b075d12b7
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

 tools/pip-requires |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 30da439d3115cd7c7f9a207718b841c5cac444fd
Merge: 49be60a 9c957bb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 17:18:47 2011 -0400

    Merged trunk.

commit 49be60a42ecc32ccfa27cf9088ce0ab3d5197c14
Merge: 1832522 b812735
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 17:17:39 2011 -0400

    Merge and fix tests.

commit a5baf796c9aba72b0f0d67f072a844465d6e5982
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

commit de37434449aaa09bfe532e2dc8668e2c3756ebd1
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.

commit 1ddf4a0abb64bc6f1a49f7324036ad8b70d7ee04
Merge: 3b39db3 1de13d2
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 1883851aa7e87e8d2877917486de8d1fa3d40cf7
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

commit 622eec32c923d2bf55d23b63f0797b5d7bd8e6f8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 22 16:23:48 2011 -0400

    logging as exception rather than error

commit 155e911883fc9b3a6cc5ffbdfc697f6be1bb19e4
Merge: 1f64b7f 9c957bb
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 15:22:21 2011 -0500

    Merged from upstream.

commit 1f64b7f3b50ed0ca2a447fd2e0eb290dd2f14053
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.

commit 414e5a4d0db4d90d5306b3b18a63820552073d05
Merge: fbf478b 9c957bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 22 13:14:08 2011 -0700

    merged trunk

commit 9c957bb7c14a786ab98bb6587877cb23e69a1460
Merge: 5291120 86780ca
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 b1a38232cd2cccbdcbf4a4aa47fdb8a45ed4d70e
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.

commit 92b3602f53864da4b6456c3c225037efe992b51b
Merge: 15da6e1 5291120
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Mon Aug 22 14:07:27 2011 -0500

    Upstream merge

commit 15da6e1a8de80ba47c92f095c0df69f58b80c0a9
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 3b39db3f9fdeea3a9fe9ec9f2c7389163db8aca4
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 11:50:44 2011 -0700

    Fix pep8

commit 27a15353b5e6bb150bc96a7d2429635a0134e85a
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 10:27:54 2011 -0700

    delete debug code.

commit 1832522d4de53537465a572a93e1e48ab4cc94ba
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 13:16:48 2011 -0400

    Fixes for a number of tests.

commit b812735a4b6b4d170f548c7b3ef45089767d1c9a
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 13:04:05 2011 -0400

    Use 'vm_state' instead of 'state' in instance filters query.

commit 91d4fb5ee7dbaca72fd412154debe7e374df705d
Merge: 080e1e4 b5399b6
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 7ec9d15f44d1e9ebf15dd3231f9d66d2c742bd52
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Mon Aug 22 08:59:35 2011 -0700

    Add 'nova-manage network modify' command.

commit b5399b6ff81e6f7954e2069a324dd59de7b0394c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 11:59:08 2011 -0400

    Fixes/updates to make test_cloud pass.

commit 080e1e4ee9f3480ad5a30f485c4d10d62b821c1a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 11:57:42 2011 -0400

    Fix scheduler and integrated tests.

commit f8f09e30aa19afc2544b6eddaaf18734b57ab24b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 11:09:24 2011 -0400

    Update migration number.

commit 72977192c0e9a0673f92ff5f75f1faa5de9e9269
Merge: 15054fb 47e289c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 11:05:54 2011 -0400

    Merged with Dan.

commit 15054fb355ade051de1098a886bcd88fcb439770
Merge: adb896d 2492ab9
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 47e289cad7d8f5fcbfa9c2d5d54291aa651d2151
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 10:50:05 2011 -0400

    Update virt/fake to correct power state issue.

commit 86780ca9d698422c61f90f7bb6a4173931dc81f3
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 10:19:01 2011 -0400

    fix test_servers tests

commit 7c198fdd50821570783765b1782ef9f31d762a0b
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 10:08:48 2011 -0400

    update test_security_group tests that have been added

commit adb896d965fba2f891fcd7e563df75416f523ea6
Merge: 5d23f51 5291120
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 22 10:01:49 2011 -0400

    Merged trunk.

commit 2492ab9391dc9aa5bdedef6a7830aa25f403398e
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 10:01:13 2011 -0400

    Renamed task_state to task_states...

commit 5d23f51a660ebe540105aba1f65cd15136223473
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 22 09:54:33 2011 -0400

    Ec2 API updates.

commit d22176a59748694a12e5105cc27e3a03eb45909d
Merge: 5bc6282 5291120
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 22 08:28:12 2011 -0400

    merge with trunk

commit 99c953391f73aac2070bdbc0d72732a4218e3933
Merge: 5291120 09e4a59
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Aug 22 09:54:28 2011 +0200

    Fixing merge conflicts

commit 09e4a59c0d5fe81bd852473ea96a3f4861852c2d
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Aug 22 04:48:50 2011 +0000

    Launchpad automatic translations update.

commit 5291120405aa99a9ee08b4925fefc63bac155d80
Merge: eb28d09 774dc84
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 2bd30715f1bf1029deca057df4bc2b2660d39491
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Aug 21 23:16:26 2011 -0400

    adding import

commit eb28d090a9b2aa75af92ffa8f18b937da0e590fa
Merge: e1d5dd3 2257364
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 52dae20ecfe79e9f29bc78b1425e900271ceb4bc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Aug 21 22:59:46 2011 -0400

    fixing bug lp:830817

commit 408dbef737c198d62751f64981ebe8a697140e4e
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

commit 92c524de8525618cca9d3aceb9a2d0c6f20a4a23
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

commit 30c5e6387e5a1dd0119e12120436663866b0d44c
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

commit 584fc676e7b2844f34fff5bcb1181713103fad56
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Aug 21 17:52:14 2011 -0700

    added exception catch and test for bad prefix

commit ae084eaad2cee271c189c49848b4ca0dc6c4f593
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 18:28:30 2011 -0700

    comment strings

commit 44e6e741060684cbf692d83de1d57f437d83f64e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 18:20:55 2011 -0700

    added unit tests for versions.py

commit e1d5dd3607839002bf39057cd56760cfeb8bcb7d
Merge: 5252874 66055c8
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 66055c8c6fc6e5c93c77dda6d2202839460378c1
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

commit e399949a32fdda0770b1b4f3366527f0133bd301
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 15:30:59 2011 -0700

    lp:828610

commit 256ca42f0292e3514b00fe7003b9d165540e7031
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 15:07:37 2011 -0700

    removed leftover netaddr import

commit 44717fe53c87a5ee292e7711af27a27af6677990
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.

commit f06775c2892eca3779cbc5d1a30e422644a892c4
Merge: aafec79 5252874
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Sat Aug 20 13:15:05 2011 -0700

    Merged from trunk

commit 651087651efa23dcdac8bd4c2caeff00020ce2d7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 12:43:50 2011 -0700

    pep8

commit 516008fa958844f897b39d27b096b3b86d5bef45
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Aug 20 12:41:38 2011 -0700

    improve test coverage for instance types / flavors

commit 58b4e41cbd945bcfd0648626eee0f6cad99c4cac
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Aug 20 05:06:37 2011 +0000

    Launchpad automatic translations update.

commit 5252874c31baae1b9ed7dc4e670e09953d3808e8
Merge: 32072cb 53a9d93
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 3ad0eaf1fa22e487017ac119a22145c95110bd97
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 18:04:08 2011 -0500

    finished fake network info, removed testing shims

commit 3e8eaf0221ef457a50d974903385b59ecebbf6a8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:51:14 2011 -0500

    updated a maths

commit 2d85bd5792d14a260639fddb13e20fcb60dc6157
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:36:52 2011 -0500

    updated a maths

commit 1fc054ef4843837c9cf34e1f632b755f27960890
Merge: ccb2af6 32072cb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Aug 19 18:36:09 2011 -0400

    Merged trunk.

commit ccb2af609be0310ece181f49878e0b6dcdd3e637
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.

commit 8264bdccc194a12213f40bf15acb28389a516360
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:18:57 2011 -0500

    who cares

commit 185f48c471e1616faa97407541489df0baef4857
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:05:29 2011 -0500

    added return

commit 1de13d2c98d6568c59767a6116f0d402d5a1e19d
Merge: 98e524a 32072cb
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 a254c05011c2b17f1f2b0ce851e3ad5823f66b0a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:02:21 2011 -0500

    fixed formatting string

commit 02171b2a48cdebef67375b0245d8dd678e683524
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 17:00:13 2011 -0500

    typo

commit 9a2c59c9d9eb0e02b7613108da81ab9207fa81f9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:58:39 2011 -0500

    typo

commit b59a87f36ca53b928c2365414113b1b03d77c457
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:48:01 2011 -0500

    typo

commit d3fb8c3e3200d959f392608c28c5140e47481c26
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:47:10 2011 -0500

    typo

commit 5c4456ad5827f95802f230e8ba77ed62a0cfc3a8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:44:23 2011 -0500

    typo

commit 31a754ae4b620b77e13a60a63a9600be46d3f7d1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:42:52 2011 -0500

    typo

commit 91f093aa5bfb6d1736f8f82714e0c53dcaab3309
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:41:02 2011 -0500

    added fake network info

commit 98e524a7879dbdda56373bb8fa0d2ddd67c7111d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 19 14:25:41 2011 -0700

    Fixed review comments

commit 91fbf2ceeed4771f4e7c08b606514d1ff2e29731
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:22:53 2011 -0700

    Fixed typo

commit 53a9d938b910bf23ca032487d1534e9735515237
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 14:16:57 2011 -0700

    better handle malformed input, and add associated tests

commit 6f046621524044d9b616fbf712b934a454bee603
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:13:39 2011 -0700

    Fixed typo

commit 55bb69e32b73848f37dfc5bb92b25fa8abcd560e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Aug 19 16:12:33 2011 -0500

    initial committ

commit 0860280a46e8592d83aeedec2dce1ad5dff63fc1
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 14:04:58 2011 -0700

    Fixed NoneType returned bugw

commit 774dc846c5bb875457eb5f23074a4bd9fc26f7a0
Merge: b3bc074 32072cb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 16:44:13 2011 -0400

    merged trunk

commit b3bc074b0f4ad588c21a58df0b16bb8bcffe0e7d
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

commit f29c3158d7ab260b98852cbaf1a856c113127414
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 13:31:54 2011 -0700

    Fixed mistake on mergew

commit a94f6e26584b5d3bf779c17fea6539304ab2b7a8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 13:31:49 2011 -0700

    tweak to comment

commit 1441df40ed678d2057e978ed7122430e985c86e5
Merge: 1fa30cc 32072cb
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Aug 19 13:25:49 2011 -0700

    Merged with trunkw

commit dbc227b9997d0ae4aa73ba0148c200cbd2283e4c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Aug 19 13:25:33 2011 -0700

    a few tweaks - remove unused member functions, add comment

commit e7a71b86e15187608fb6f51b5d3ec3c3dde1edc8
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

commit 5bc6282bfe87ec600f5b2bfcc5013bb6d0d4c3fc
Merge: 850b8ed 32072cb
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 16:03:24 2011 -0400

    merge from trunk

commit f728f61724645702ab6f184ed859bca90c9574a5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 15:58:50 2011 -0400

    pep8

commit 4c801ccca641d8ba88d962fc95ba0f9c5b32601e
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

commit 1fa30cc8002b1cf84cbbff18d4f1f44581ec522c
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

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 3ebc32d5af9271e9a5bceeed9d8b3688bffb996c
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

commit cf23df469be2244854e9c54720b6d887cffdb6b0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Aug 19 15:13:40 2011 -0400

    vm_state --> vm_states

commit 32072cbc4943bb75fe92299617f1dfdd7535ae62
Merge: 66edbdf f130c55
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 850b8ed9382783a22a0d82b39645832b54fa8fe7
Merge: 469140a 66edbdf
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 14:55:38 2011 -0400

    merge from trunk

commit 66edbdf2282057c00aa5282f18524b895636b596
Merge: c2319c5 6264b2d
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 19 18:37:39 2011 +0000

    Removes the incorrect hard-coded filter path.

commit 551f17ad1c3c7d0dbc88b469eac335564979c747
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 :(

commit 0930fc1a71e1d2dcd7c864728140c1c907187191
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

commit 5d06b2b4ead26d284a2a1e3e4315e00b31294093
Merge: ff2a2a3 c2319c5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 19 10:08:46 2011 -0700

    Merged from trunk

commit 2257364ee5455e236ad3b8f181e15cbae7fcc010
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 19 10:01:25 2011 -0700

    Fixes primitive with builtins, modules, etc

commit 469140a8cd831bc450ce6f6dc3c73de281e35004
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 13:01:21 2011 -0400

    fix test_virtual interfaces for tenant_id stuff

commit c3a21664900adbf8ddb75ecd7cd1481a5f124a76
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 13:00:22 2011 -0400

    fix test_rescue tests for tenant_id changes

commit 293fbaab3b417475f0f57afc28241707ced67b9e
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

commit 6b1e49c09be107607dd23d92efe794a72aff4b1c
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 19 08:44:14 2011 -0700

    Add copyright notices

commit d23a960218fb57b2278c286bcf1141a3305ff891
Merge: 359f30d c2319c5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 11:26:32 2011 -0400

    merged trunk

commit 7d111a7117e58ad583b72f09aa316145c1c69fae
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

commit 7f020966ba5d07a96fd6c2ba119484938fa68570
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 19 08:08:23 2011 -0700

    Fix config_drive migration, per Matt Dietz.

commit 359f30dd44631a49546b5c36d7a52cac45aaf3c2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 19 10:47:16 2011 -0400

    updated migration number

commit f5ebf7afeef1d5b6b1a600ee2665ff975ebc9155
Merge: a3000ae c2319c5
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 19 09:54:05 2011 -0400

    merge with trunk

commit 0febefdf84f64c719d0c07793b377c5671c6a53c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Aug 19 09:30:52 2011 -0400

    Bump migration number.

commit 348bd0e638de40e45a16a70f690b5c4b3062f160
Merge: 14d8618 c2319c5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Aug 19 09:30:17 2011 -0400

    Merge w/ trunk.

commit 1dbbf6c9585ac91679c5145ade90491088727e38
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 13:54:18 2011 +0200

    pep8

commit 39b2e7f61db3ca436300f5d0aa1386df85707c35
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 19 13:44:32 2011 +0200

    Start improving documentation.

commit c2319c5a5c336fa952cc0396160425c87ddda647
Merge: fda2dcd 393e79a
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 cce5035643b78e8e37f5043a0dac0eab2ee0feab
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.

commit 87e3654158a6b99f17c6d1a81afedf371ff2e148
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 22:52:45 2011 -0700

    add key_name/data support to server stub

commit 37e3a9eeaead4dc59e7a77d42a514737dbf76eb6
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.

commit 3c2f8508a7c075178ce1aec1283169bc73ae0282
Merge: 7e22523 ff2a2a3
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 a3000aec43db78bf0842699a2520b4b0426fd52b
Merge: 06a75e5 5950370
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 18 22:24:31 2011 -0400

    merge

commit fda2dcd91f7c638837cae2b5c638df8dd3ded76e
Merge: 0b90862 23a8555
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 178fb72ea475f2796097781d899c8ca0954c65be
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Aug 18 19:05:40 2011 -0700

    remove security groups, improve exception handling, add tests

commit 393e79a4f52b5c5420b123eda0aad868b8723d77
Merge: d856530 0b90862
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 19 10:22:24 2011 +0900

    Merged trunk

commit 20e05ddb3d420c21685e9ff4d16bd6a0a89069ec
Merge: 2335aaf 0b90862
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 21:09:01 2011 -0400

    merged trunk

commit 0b908622b49a8d1aeb57a669cfa6d1294c7212e0
Merge: bdf6f10 c578363
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 bdf6f102b0ddb202d38ebf42c2b41e08dee84f25
Merge: d6d3149 2b4b3c7
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 8b2c7166bb4c93603a6477ae96da804bcd4d686e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 16:46:16 2011 -0700

    tests pass

commit d6d3149fa8719f26d72dc033c66d3ab0dabc7a9c
Merge: 7c7f3ce 3f8ce87
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 9254ad78c52f06573ffb134542540a6c36c7514c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 16:26:32 2011 -0700

    follow same pattern as userdata (not metadata apporach)

commit 2b4b3c7814eb956283c711e877e2d3eee04f1b4b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 16:22:22 2011 -0700

    rename the test method

commit 7c7f3ce08a86a788431042aecc24f699a54018b4
Merge: 3c89389 c8335be
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 23:01:46 2011 +0000

    Updated docs for the recent scheduler class changes.

commit 3c89389757010abb5bebc71189f3a50f757a61ff
Merge: f8ee90f 2fb5497
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 595037033e4f57ea8a05190e23cce8243947d466
Merge: 496964e f8ee90f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 18:48:47 2011 -0400

    merged trunk

commit ce0a4346a94101f65dccddf6d5fed19cb0f6b4c2
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 15:42:30 2011 -0700

    added volume metadata. Fixed test_volume_types_extra_specs

commit f130c55c1940d12a70b4a08e246d28116b47ee19
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 15:41:20 2011 -0700

    declare the use_forwarded_for flag

commit 3bbe82e873969a9c8aef22d746fca779ae78c9e1
Merge: c5a6f7f f8ee90f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Aug 18 15:33:15 2011 -0700

    merge trunk

commit f8ee90f84b89463e90b76aa8386bc2bba5c96f06
Merge: 26f66b9 4daeafa
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 c578363ac37d967a71e3707070c9a8142d19e5de
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 17:09:34 2011 -0500

    Added unit test.

commit c5a6f7f270b2213c0b98818af2ec9ea1e961e7f4
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

commit 26f66b9e26089e64f6ceb726dbc17ddf307a489c
Merge: 08e399b 8da041d
Author: John Tran <jtran@attinteractive.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 08e399b68f8be38b182a2210871d2cbeb525a3c8
Merge: 5154779 81f52cd
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 8c71ec76a410f3b74cb40fc64493722c56089d08
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 14:40:05 2011 -0700

    added unittests for volume_extra_data

commit 6264b2d77615cb43fed0d5e00bf2e0077a71b9a0
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()

commit 4daeafa648eca23e1f311367aeb436d6f1834520
Merge: 4319e58 6b7da5a
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 16:24:24 2011 -0500

    resolve conflicts after upstream merge

commit 4319e58f672a962ac15f8a9b6c6cdcb0ab67a767
Merge: 5ca476d 329d218
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 16:23:08 2011 -0500

    Change the call name

commit 51547795458d70f2c4b9f7919d4da8e2dc96b1ce
Merge: 9ddfbd2 fb2aa74
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 18 21:14:55 2011 +0000

    Cleanup the '_base' directory in libvirt tests.

commit cc3bfc6ad7e645a442969a65fd8d326f61617491
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 16:07:02 2011 -0500

    Oops.

commit ce7a8126d8e4b4030e88fc780b7e23b06be3da91
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 15:58:12 2011 -0500

    Review feedback.

commit 3f8ce87d7e9c6ff301be52a3b107d5b54a03560c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 16:56:23 2011 -0400

    Added 'update' method to ServersXMLSerializer

commit 81f52cd9683ba926c8fce0990d0c5765343fb912
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 18 13:45:45 2011 -0700

    Added more unit testcases for userdata functionality

commit 9ddfbd220aad8c9b006265c2e99f2c947baa8598
Merge: 329d218 dc0e422
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 18 20:44:30 2011 +0000

    Remove instances.admin_pass column.

commit 2335aaf045b054665bae4a90a3484a77e2d5978c
Merge: 07ddd2d 329d218
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 16:41:48 2011 -0400

    merged trunk

commit c74f25c1094abf60184c7727267c5982d0224ffe
Merge: a9a8416 329d218
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 18 13:41:02 2011 -0700

    Merged with trunk

commit 3f546b6f8118805c8b48038958042d031435c267
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 18 13:38:11 2011 -0700

    typo

commit 07ddd2d11433d9702ddb8b413fc2bed9802c2edd
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

commit 2fb5497f5c00282995255a7b1406f6c28965a8c9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Aug 18 20:25:32 2011 +0000

    DB password should be an empty string for MySQLdb

commit 56b078d58cb22e7744851bb07c9854b3edf75ad3
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)

commit 06a75e575f9ae20675d725835cf9c3674ceb5b90
Merge: 11bb188 329d218
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 18 16:12:49 2011 -0400

    merge from trunk

commit c557c8cf8deee0770c30caba22ee20b53de834d6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 15:08:51 2011 -0500

    Better docstring for _unrescue().

commit fe76c257ad90f62390d114d3575b200653cfa528
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 14:56:22 2011 -0500

    Review feedback.

commit 6b7da5a1ac3136e54b73965acff7295d5380ab31
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 18 19:40:59 2011 +0000

    Need to pass the action

commit c8335be6e3e10ce44984f2c7bda440fc13fba148
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.

commit 5ca476d3bb358d66b64c772bb5be016646565ad1
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 13:55:38 2011 -0500

    Syntax error

commit 29ce533bbfb8c60fa5896909662618307ec24054
Author: matt.dietz@rackspace.com <>
Date:   Thu Aug 18 13:47:09 2011 -0500

    Moved compute calls to their own handler

commit dc0e4226600d0b32f44df3fa4e4f88eb770a5975
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 18 14:44:10 2011 -0400

    Remove old comment.

commit 749e9e2fbd6cf1fd41c13d7156c67f8572daf3f7
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 18 14:34:14 2011 -0400

    Don't send 'injected_files' and 'admin_pass' to db.update.

commit 194bc1e47edb1901248830abaa383174640a0ca0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:31:28 2011 -0700

    fix docstrings in new api bins

commit cbc14ee8517807e2f3472a7b71a1e479ad87dc3b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:28:43 2011 -0700

    one more

commit d9956ee38343a84100af069fc64941f7ad13560e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:28:02 2011 -0700

    fix typo

commit 9d326ca74a2b225689f893c098fc94b17f6d780a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 11:00:47 2011 -0700

    remove signal handling and clean up service.serve

commit 82977441a2307f173d726e9f974410160367756c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 10:56:14 2011 -0700

    add separate api binaries

commit 35833da5de40c862738796054d926fd41dacdc28
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 18 10:55:39 2011 -0700

    more cleanup of binaries per review

commit 71b90bb4e4453f05774e556801bdd9ad90cf1b6e
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.

commit b73a78d5d7cf5cf669b5da4df218c28829472f93
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 12:25:22 2011 -0500

    Minor housecleaning.

commit 329d218abdcd2517b2a955b2ada11d4cfe5eecf8
Merge: 6821aaf 48ad3e6
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 91291f1b694c707a89e5488c5dc9f9467d7e6caa
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 12:20:40 2011 -0500

    Refactored a little and updated unit test.

commit 71e2e9d3662c339bd4467f6f1ebef548378a6731
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 18 12:55:27 2011 -0400

    minor cleanup

commit 23a85555479e8504a0213bed60b6a9540f21c2d6
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

commit 00a0f598c35a12e942217e07661e19f68dbc3880
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()

commit 14d861894d2d7c52fa4583b033a4c305b3c9cc4d
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.

commit 798fe7bdb6962734a3a6237781e903a97989d790
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

commit 489063bfb5426a6b162ef9d6427b4470f41ceb14
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 11:21:35 2011 -0500

    Added rescue mode extension.

commit 65beb57f22079e084ae6f41a38ef01b25d40d7b3
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

commit 47ea4460c52dde01e7d7af7a3931b919d11525dc
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

commit d8e888c61d45258f6517f7a02431a4936ad8e19d
Merge: aca25f5 6821aaf
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 18 10:05:37 2011 -0500

    Merged trunk.

commit ec69df86ae897f3ee24d1552b23e91d5d2c3a3a5
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

commit 6821aaf26c69f4d6804a8b6cab81af4abfc81a94
Merge: 76f3de7 3958aa5
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 3958aa5a7e47a72dc16b6b20a073b59c619e6749
Merge: a78edf4 76f3de7
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 18 12:57:34 2011 +0000

    Merged trunk

commit 76f3de7a7002b99b0f84b915e58940fd1c75ec2e
Merge: 71e2c58 c369a73
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 d856530e5d19f557d83014132349b15dc6c0affb
Merge: f74609d 71e2c58
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Aug 18 15:50:50 2011 +0900

    merge trunk and fix unit test errors

commit 081af7ff5ff07e00b53ac2689bdff94269fedb73
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

commit 76c1e7f1122925fda3890189f66e518d62d0faad
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 17 22:00:38 2011 -0700

    bug #828429: remove references to interface in nova-dhcpbridge

commit fbf478b02a2184f31c7efa328f658b52714bfe84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:35:54 2011 -0700

    pep8

commit 7c4a2ec232234fc17a95592e20979c5295c9abf1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:26:33 2011 -0700

    remove extra reference in pipelib

commit 4043726cfb71dfc7307433d8a72d73c83a905877
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:24:52 2011 -0700

    clean up fake auth from server actions test

commit ae4aa18b2485b45772e39ee07c870a09fc8ddefb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 20:22:30 2011 -0700

    fix integration tests

commit 54fbe1161114a7875591ad7da2d9934c0e92b567
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 19:31:01 2011 -0700

    make admin context the default, clean up pipelib

commit a023cd4730de1d49cadb91092f4cc1833bb62480
Merge: dadc667 71e2c58
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 19:06:21 2011 -0700

    merged trunk

commit aafec79cd83c6acfc1fd9732a1d881ffb459becb
Merge: 947530e 71e2c58
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 6f25f4e04e97e5d6c0398c0c9656d3e70d86eb48
Merge: b43f74e 71e2c58
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Aug 17 16:44:34 2011 -0700

    merged with nova-1450

commit b43f74ecc280fe5617230248a8338f73eccffac3
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

commit 6581fabf978fb5d94983f52a8e919432df18be1e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 17 16:25:53 2011 -0700

    Make all services use the same launching strategy

commit 4065f2457cd60ee3aa6b63c7bb1f747d153dd5a4
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.

commit 86c951b45cc3007da4c144d74e5881c7be99eb7e
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

commit c369a73e5c30c0f232d1dd7aaf81be38ca386188
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.

commit 1870bcd215ff75f92d6fddd6ec4836256f546db2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 15:40:17 2011 -0400

    Added accessip to models
    pep8

commit 90c4067e3836b614615d2d8a5c7aca1352ae7dee
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 15:33:08 2011 -0400

    Added migration for accessIPv4 and accessIPv6

commit ff2a2a300fedb3234fe64b6f1179e3a476c13391
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 17 12:08:14 2011 -0700

    Fixed broken unit testcases

commit d100a5c25e2afff93a735c2f9b1bbabcbe0e147a
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Aug 17 13:30:47 2011 -0400

    Initial instance states migration.

commit 9e1de405640ad1433d93056c2e12a8915027e36c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 17 10:23:44 2011 -0700

    pep8 fix

commit 65afb4da828561e56e332c64f583eead9b933dfd
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Aug 17 10:05:01 2011 -0700

    fix some naming inconsistencies, make associate/disassociate PUTs

commit 7e225231e9ee01e69c701c7b453f67d2edcb1986
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

commit 496964e377b257f9fbf1bba15ea1a1b61b9fdbba
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 12:37:50 2011 -0400

    very minor cleanup

commit 75ced2f91aa2b2db5ed8c00cfbb7a9aed1d0ab2e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 12:36:39 2011 -0400

    Undo an unecessary change

commit aca25f57b8dc7cb8fb5418fa45cf348b8d44c448
Merge: a8c2ec4 71e2c58
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Aug 17 11:19:43 2011 -0500

    Merged trunk.

commit cba145bd3a78a6b83d601025f1a52987e88618c2
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Aug 17 11:51:39 2011 -0400

    Pep8 fixes.

commit 688440c5ed6f7a8cd511b12abde36cd309514be6
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Aug 17 11:46:28 2011 -0400

    Split set state into vm, task, and power state functions.

commit 6b3ba34aa1f04eced06b8e4a0ce39187bc89471d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Aug 17 11:19:34 2011 -0400

    Add modules for task and vm states.

commit 11bb18893bbcf921f0fe4974a588c352f68175b0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 17 10:55:27 2011 -0400

    Updated tests to correctly use the tenant id

commit 71e2c582db9b6661d267e9ccbe1e060c78e0eb08
Merge: 552cef4 6172b10
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 2df82d2efe60bd38568624c873b43ea7580cede7
Merge: 5702362 552cef4
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 17 08:41:40 2011 -0400

    merge from trunk

commit f74609dc680601bd51a87f22bbd6849ae5a8e3d7
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:23:21 2011 +0900

    Cleaned up the extension metadata API data

commit 4dc515a4afe13938852c1cd838948f94b4670f57
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:17:09 2011 +0900

    Updated get_updated time

commit a474ad2cb0916442dfd2a97f2e6cd522402d8642
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 20:12:24 2011 +0900

    Cleaned up the file

commit 058825ea4659f2772eef637f443afd07a3d3de62
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:58:57 2011 +0900

    Fixed vif test to match the JSON key change

commit 7999689c05f5f7859d377468172173356fe861d8
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:58:26 2011 +0900

    Added XML support and changed JSON output keys

commit 3a2a877e01fd5a06e5009188985fa7d5f3a1ad8a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:07:14 2011 +0900

    Added virtual interfaces API test

commit 763750018b191fa9ca695f8e369110f43beb8daa
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 19:05:29 2011 +0900

    Removed serverId from the response

commit 013a5c2a191c8c7e336e99570121be2786ff2437
Merge: c8d6a94 552cef4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Aug 17 17:58:14 2011 +0900

    Merged trunk

commit c8d6a946ca28f7ea7fac42ef9d896382cf8f67fe
Merge: 2fc25ce af70016
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 48ad3e6ed54fa2c96eacc0efb173263b0123992b
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."

commit b1f1fbf644e7c72aa71da51d50217485d0d5c0fc
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5702362f6814204f591d961319debfca3b28c24a
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.

commit af7001605e624f2a44b8bc5bda4506622e2c700d
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

commit 7390927f6baef70c715a27707c525a3b453d37e5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 16 23:15:54 2011 -0400

    Remove instances.admin_pass column.

commit 3199d38de5ee34d9abc561d748b741bfded04562
Merge: 2a9fae8 552cef4
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 17:01:08 2011 -0700

    merge trunk

commit 2a9fae8e796e08cc88c583751d1440ed33502b44
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 16:59:36 2011 -0700

    all tests passing

commit 07d4f22a9b39db2c14f6ad57afa5c1c74bdac61a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Aug 16 16:50:15 2011 -0700

    fix unit tests

commit 0d03094e5f961818bcde3b4b3c036027dee9e3c6
Merge: 2967d3a 552cef4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 16 16:18:48 2011 -0700

    Resolved conflicts and merged with trunk

commit 2967d3a386d9fd8c9ccc587c7ed1033bf4f0a8a8
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

commit 552cef4ecc6d12d7090e51d497f6dd998051887d
Merge: 2d07276 1b48f04
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 2d07276d448fc097539d204ed31fa9adbf5c4221
Merge: e5fc6d3 a74d28b
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 e5fc6d3d9e68debf0a2a5f610a7b320101613b7f
Merge: a8c2ec4 d4661e2
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 d4661e291dccff471aa72948af4507a62a83db88
Merge: a21b280 a8c2ec4
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 14:22:26 2011 -0500

    Merged trunk.

commit 81a3302ee1700aa100ba1ff9979ab24aa62d5501
Merge: 2c9fc1f a8c2ec4
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 15:12:42 2011 -0400

    merge from trunk

commit 2c9fc1faf33fc257aa2d1814eae31b0269ac981b
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 15:11:32 2011 -0400

    make project_id authorization work properly, with test

commit a8c2ec490cb0a4c58cde669050f39c6812d1057f
Merge: 68a99c3 d5ee67d
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 16 18:54:34 2011 +0000

    Use netaddr's subnet features to calculate subnets.

commit fcc094662fc6750f86510e419dd99a4c21096873
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 16 11:46:22 2011 -0700

    make delete more consistant

commit a21b280683c0d9a93a9f43ef439a0ecd12ffaf61
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:45:13 2011 -0500

    Review feedback.

commit 3411a21734653277b397b1f6221356901ca0541f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:43:33 2011 -0500

    Updated note.

commit 0fd1c20cb7e1b1d866284999f7a460177b0f0f42
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 16 13:36:11 2011 -0500

    Allow local_gb to be 0; PEP8 fixes.

commit 6172b10fec26ed690e96de66743b6eed463d0225
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 16 13:44:03 2011 -0400

    Updated ViewBuilderV10 as per feedback.

commit 68a99c3d6f8539f02e22449cf924921a2a301ca4
Merge: 08b1dcc 937be77
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 08b1dccdad06af8fa52071115858c4416db00f0f
Merge: eac8838 4311e60
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 8da041dc51ec54c9e3542e0ed8a50af4c613ce42
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Aug 16 09:18:13 2011 -0700

    test improvements per peer review

commit 4311e60165ebe671183bbd04463d34c81a2dd249
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 issue

commit e0dfad7b8be344ab0303a50b6573f88ca739c838
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    defaults now is referred to using a tenant

commit 9c96157fa9b6ca587284651620da62ddc852de53
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing up the show quotas tests, and extension

commit 3cb088b62220138bb487eb6aa7b95b6405ccb36b
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)

commit 01cd8d7d2bebe8fc50cc8fe65ddb6f8b064b6526
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 issues again

commit 4d279b5fc402edb62c34227fa55e0ae490568a66
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing spacing issues

commit 6737708e8e45771bc788ea7d905a1120c69912ef
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    cleaning up a few things from pyflakes

commit b49d08e837cde4a087feee00771e2db46a28626a
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    fixing pep8 errors

commit 717ed718fe77acc4d3375a59286fef975681ba7f
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

commit 2489ffa34490ff35725de7c72b356c217d9b31d3
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

commit cd6ff845e170037c0230f3d5b0c06103e4b8907c
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:14 2011 -0700

    merging test_extensions.py

commit 9d4970da381609ccb6d5d14e19545b4a8b6453e1
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 16 09:15:01 2011 -0700

    another trunk merge

commit df829ce71c5afbe41443152160ad8e6bf610f2c5
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

commit fb2aa74d947cab3975918de793f4a7a52a1de74c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 16 12:02:39 2011 -0400

    Cleanup the '_base' directory in libvirt tests.

commit ea1ff2737d740dbe0f20c8382373776a012ae42f
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.

commit ef9c1608edefeba54a03e51bc93bfaf2b748d7d6
Merge: 5b0c9c8 eac8838
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 11:31:08 2011 -0400

    merge from trunk

commit eac88380958168a2f4e26bcfad33b75d4f22b2cf
Merge: 46d844d 3ec7716
Author: Dan Prince <dan.prince@rackspace.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 3ec7716ba80ab1bec10d1ba949fe263a731b98ff
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 16 10:49:26 2011 -0400

    Fix test_metadata tests.

commit d5ee67dbb223f8196cc7b9cb6bfe9a06eacf27f9
Merge: 66e2ad1 46d844d
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 16 09:23:38 2011 -0500

    merge the trunk

commit d34b6f67e1ee5c01c3329ec28a1d10cd56df3b73
Merge: d164b85 46d844d
Author: Tim Simpson <tim.simpson@rackspace.com>
Date:   Tue Aug 16 08:56:08 2011 -0500

    Merged with upstream.

commit d164b85d2b01782f8299f3d09b81122cbceb641c
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.

commit 5b0c9c8eb88648d38b89d1b8c43406e2300726fb
Merge: 76258f5 e677052
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 16 09:26:55 2011 -0400

    merge with trunk

commit 46d844d3855c791861fb354c134cf201aa4a02b8
Merge: a44812c f474326
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 a44812cc0ecba62f6f2cd8afd29eea54b39ecae9
Merge: ba35ce5 973b864
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 ba35ce585e29035d139453cf7a1883080ae25dd6
Merge: e677052 48cc950
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 a0650b9c90718dc0eae1783dc117043009575354
Merge: ab6ec99 e677052
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Aug 16 08:41:52 2011 -0400

    Merge w/ trunk.

commit 2fc25ce28b6fa7c77360228fa9757d69609f49dd
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 18:52:29 2011 +0900

    Include vif UUID in the network info dictionary

commit 7779b6b0511f1793c042be66967d6325195c220f
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 18:37:50 2011 +0900

    Added uuid to allocate_mac_address

commit 6670ec238fc1df16a333284e22b454a1745dc12b
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 17:51:45 2011 +0900

    Fixed the naming of the extension

commit 0f6c074a4af4a2a8abfd5cf59a1ac8774648d70a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 16 00:31:54 2011 -0700

    redux of floating ip api

commit 653e72b23ae2cb2928da5f6d1385544ed6fa6046
Merge: 8429d3f e677052
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Tue Aug 16 14:20:09 2011 +0900

    Merged trunk

commit 2710c61d68b4f112e82114705deab3d55da1e53e
Merge: 68bfefb e677052
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 17:30:13 2011 -0700

    Merged trunk

commit a74d28be4a73ea23aaf27cec7abdcc22fd521cea
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

commit 01a7d08d3eb2419e90de7fe0895e33e89a382581
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 16:29:52 2011 -0700

    fix error logging in s3.py

commit a78edf4aea32aa8e21fb9bd79e4a59c7a35126a2
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:31:24 2011 -0500

    pep8 cleanup

commit 53386fe702e5479b615f0a74d217ccd59808c9d0
Merge: 75dfb98 e677052
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:11:58 2011 -0500

    Merged trunk

commit a9a841602948b57b274b4e692363b280fdd8d056
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

commit 75dfb986d381da149bec0e4e82873446ea2907cc
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 15 17:09:39 2011 -0500

    got tests passing with logic changes

commit 66e2ad18b80822e73567f0f02fcbc124c6c738d8
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:48:28 2011 -0500

    pep8

commit bc29405dbdc472ded6b19b11dc60ae241d351626
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:47:48 2011 -0500

    pep8

commit 6f4823b6a17fff8dd002971966c1efa118c3682c
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:46:30 2011 -0500

    add note

commit 75036a451b3607fddf936387463d47c819c434e9
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 16:41:11 2011 -0500

    have the tests call create_networks directly

commit 68d722115dcf83b672a56dd9f6551fb49a46a66f
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

commit 130decd8060f566dc7519db99bb9e6db5bf54b6e
Author: John Tran <jtran@attinteractive.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

commit ee9172126cb058c0f71dd61994612295eb1224ca
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 15 13:48:09 2011 -0700

    added cloud unit test for describe_instances to ensure doesn't return deleted instances

commit 487f315cdd29fb7c1d1b405fcce5085713669c8c
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:47:11 2011 -0500

    return the created networks

commit a9e720bb1df915979a2d7fdc00171acdaeb22139
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:45:14 2011 -0500

    pep8 fix

commit f0a28123c7c916f095452a79080a3bae7e1ac5d0
Merge: 56e969f e677052
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:33:37 2011 -0500

    merge trunk

commit e677052ac0f532b0287893140df4f4cefcb39e97
Merge: 2b60112 09d93fe
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 56e969f3945e344591f8666f08b321ef3f9809a6
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

commit 11c904fa16b5b14b422e3f3cf1d9ad87c95f6cfc
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Aug 15 15:28:28 2011 -0500

    fix typo where I forgot a comma

commit 9fb9418e85f4b61d2fb436805f4ecdcaf21a8b1e
Merge: 33def48 28cd70c
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 c8e0ad408fbb247289deec267528f6f60a0ab5f7
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 15 13:22:14 2011 -0700

    fix bug which DescribeInstances in EC2 api was returning deleted instances

commit 2b60112280e5c60e322f228ce352756d94cd19b0
Merge: 5e9e11d ef1a656
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 5e9e11d5940b0263297c58a29fa9cbdd2efb65d7
Merge: 6830d0f a2dac07
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 76258f506635de278a41850f6be8928a0589de9a
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 15 15:41:07 2011 -0400

    put tenant_id back in places where it was

commit 6830d0fa0d213705824682841b018c902d703fd8
Merge: d7f0bf5 a058193
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 d7f0bf5872142f6e6ad78d945931ecc857931efb
Merge: 28cd70c 17cf4ea
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 a0581939960fc542423ea1438b151852fd942cfa
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 15 12:04:51 2011 -0700

    making body default to none

commit 881769ffa7f64230001159cb27d53da43a8fcb0d
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 15 15:00:42 2011 -0400

    pep8 fix

commit f0e0ef7cd07035e4fe45db520bc41a1245a265d1
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.

commit 961d91ee63eddff5687a93308c0806b73868c5fe
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 11:50:54 2011 -0700

    Fixed merging issue

commit b7c5b5e66f627612d193f36a91a0ef0d9e990dfe
Merge: fd35954 28cd70c
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Aug 15 11:47:30 2011 -0700

    Merged with trunk

commit 5fede1358b25ba4e9287f33e905230ffe73fb76c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 14:45:08 2011 -0400

    Updated rate limiting tests to use tenants

commit 48cc95013cfc6f3d4b0b8ad644ea8c6e7861acfc
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 13:35:53 2011 -0500

    Corrected names in TODO/FIXME.

commit ef1a656c42c3a0a144dc3f0f6958d52a60917e25
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 11:31:44 2011 -0700

    remove openwrt image

commit 17cf4eaf9d2d1fa18cd40672dd7ce7078a1f15ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 15 11:10:44 2011 -0700

    Fix the tests when libvirt actually exists

commit 167d1ac9ed46ad62781d97fdfca3fe286d0ca6be
Merge: 2754f86 28cd70c
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 12:18:22 2011 -0500

    Merged trunk.

commit 28cd70c71865ab839523470cd8c22ec2be410cb1
Merge: ca0d92f 5d48794
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Aug 15 16:14:35 2011 +0000

    Add durable flag for rabbit queues.

commit 2754f860f87657f0226898e5e42798f36da31427
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 09:47:01 2011 -0500

    Fixed merge conflict.

commit 93b570779673e7b2102e6c3bcf45f45831a2fe7a
Merge: a0884a1 ca0d92f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 09:57:55 2011 -0400

    merged trunk

commit 38a8e826ee2a14ec1814e13e0509dd5c7879d189
Merge: 5350fc0 ca0d92f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Aug 15 08:55:33 2011 -0500

    Merged trunk.

commit a0884a104d878a81af52fb74cfcf36dea10beafd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 15 09:35:44 2011 -0400

    Dryed up contructors

commit a2dac07dc12c7f51ea65247b77c1fb5ff232c085
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Aug 15 02:55:22 2011 -0700

    make list response for floating ip match other apis

commit 1b48f0460d343f5af79bfd4658d5baa7e8516147
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Aug 14 20:05:18 2011 -0700

    fix missing 'run_as_root' from bad merge

commit ca0d92f379d26683c2d1cd6cc2e102e651ffc76c
Merge: d7cf95a 058c38e
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 d7cf95a65c9e7407f0caf5a6575bc0dc624d790c
Merge: 814725a d667240
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 814725a48547706836f9dcc037dc913e23052d3e
Merge: 94deb52 85c2d22
Author: John Tran <jtran@attinteractive.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 94deb522b956e9aaa2191c676531ad46edc044a1
Merge: 6edadb5 5a6e1fe
Author: John Tran <jtran@attinteractive.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 6edadb5be778b988ee413a01a7d59a26dcd8710f
Merge: 5a63fd7 291fc2d
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 5a63fd776377d677323439b5ef0b7c04b4e335b3
Merge: 9b35589 e08df38
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 9b355890c8134d93c43e9ee6979894683e10d3fa
Merge: 1dbdb36 ffa4953
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Aug 14 03:27:38 2011 +0000

    typo fix

commit 1dbdb36e3c5bcfe67ae5360e2ae686569d93e6c7
Merge: b7c7316 31aa361
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 b7c7316542ab0c6aa2df36db1d09b1be2a4a879a
Merge: 24083cc 7db4487
Author: termie <code@term.ie>
Date:   Sun Aug 14 03:14:08 2011 +0000

    Allow different schedulers for compute and volume.

commit 54d88dd5742438db085c9588a47369b81f79ada9
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.

commit 1117e945469bed3fd9bae3dd981a40df711fdb95
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

commit 43c1aff7cbee49074264ffbaaab304734120a41b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 22:05:34 2011 -0700

    fix all of the tests

commit 6cbb291c8e2b548ee7fd00a7e547bdbb6bbad1cf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 21:17:20 2011 -0700

    rename project_net to same_net

commit 048b33174eae5251c75a93018f08226afe539a3d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 21:03:53 2011 -0700

    use dhcp server instead of gateway for filter exception

commit 35eb1cb4a7b28ec7237bb1597b34d5327e4a07a7
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

commit ca5dcd315b5f45f281839ded5f72d1ee1763d047
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 12 18:16:07 2011 -0700

    fix issue introduced in merge

commit 3750999d22d5104a6fcec32d24ebe96ae6b21bef
Merge: 2a25bbe 24083cc
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 2a25bbe7b8f525b9f5a8d751da85bf4a9f4f2d44
Merge: 37b5c3e ab48cc9
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 5d487947ae0c2576737117341ff7ca25c55c948b
Merge: 1bf9707 24083cc
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Sat Aug 13 00:06:42 2011 +0000

    remerge trunk

commit 1bf970708535a3038113af443001d6e64fc7291c
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

commit 947530e1352b334269374d65f87b380ddb3bd854
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

commit baeb050b1e4b36ddd173fc6a370c28204a5592f2
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 12 14:33:27 2011 -0700

    Fix ugly little violations before someone says anything

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 5350fc0850d94c092a56af7a8c214e793a1f278b
Merge: a259df7 24083cc
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:29:44 2011 -0500

    Merged trunk.

commit a259df7402eacc515fb4ab6d11dc5162c5ced061
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:25:16 2011 -0500

    Updated logging.

commit d79de428ce88a888dbfc2797ddfd24a1cbd542dd
Merge: 8f53784 5c1ed31
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Aug 12 14:23:10 2011 -0700

    Merge config_drive with trunk

commit 92c796f018cd95b08fbd1ec74e59fc90a2988ece
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 16:19:46 2011 -0500

    end of day

commit 24d0b2723871b0a4869b0acdb31f1264573c096f
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 16:18:48 2011 -0500

    Check uncompressed VHD size.

commit 973b864b3fd4cdf12e3af4e0e14d3fae56cfd450
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

commit 8b44c74aa7e31f3de1d6c7d5ed8be21072c43bf3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 12 13:37:22 2011 -0700

    nova-manage: fixed instance type in vsa creation

commit 31aa361bf5322ab7098ef01c751b75bf24d66020
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

commit 351e60639c1f2de2a8e75d700a942d97e20b6ebd
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

commit 7726fd4dfa7d64179d848ff831252231c79fac7d
Merge: 8966bdc 24083cc
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Aug 12 19:48:19 2011 +0000

    Merge with trunk

commit 68bfefba30adf9089c37a00806a0d4c93696d7ac
Merge: 0e9cddf 8f53784
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 09d93fe114ca48d4a543f09b0d31f969fc355c78
Merge: d452048 0f024eb
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 a7bffc229463623b2279bf79d8c79b5187fdd397
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 13:58:26 2011 -0500

    Created the filters directory in nova/scheduler

commit dadc6676ed6798657a513f60ad57e4da9fa45d4c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 11:29:25 2011 -0700

    removed admincontext middleware

commit 974a85fc4f393e7ce1d1ab71f2bf37273de96834
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 11:28:47 2011 -0700

    updates from review

commit 263b3b849a10fa6f320f30784e23202f6d66dfdb
Merge: 92411ee 24083cc
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 14:09:53 2011 -0400

    merge from trunk

commit 92411ee67747077423fbf3d2063f7e2ea4f29920
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 14:09:25 2011 -0400

    fix merges from trunk

commit 24083cc75dfab6c59c1258d8399d0f8963a5d515
Merge: 8f53784 4442f70
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Aug 12 17:58:55 2011 +0000

    Nuke hostname from nova-dhcpbridge. We don't use it.

commit 33def48e7f5fad51a7fb31ba8e7297700e110839
Merge: 4947946 8f53784
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:28:53 2011 -0500

    merge the trunk

commit 49479464fde86333b03ea2b9a73c0dc5d41c9fe3
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:23:50 2011 -0500

    need to actually assign the v4 network

commit 8f53784b3148503358f021057cbd3a0b6fba3ac1
Merge: 4c5a517 f11fed7
Author: Dan Prince <dan.prince@rackspace.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 120153b00ca9b1c6dc7225aa9bfad1d27d8a8004
Merge: a3fd3c8 4c5a517
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 12:15:13 2011 -0500

    Merged trunk.

commit a3fd3c8be26bea7a8da55de49be63e5b168cfbec
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 12:14:40 2011 -0500

    Fixed unit tests.

commit 1bfedf58b50d5b0124530deca24a209f39095a94
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:13:14 2011 -0500

    only run if the subnet and cidr exist

commit 5d4df75f3ffd2ac5673764744e8a8b54308cc5c1
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:11:13 2011 -0500

    only run if the subnet and cidr exist

commit 3419b0e402c3348debcecfc446dab0f840be265d
Merge: 590cca5 4c5a517
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 13:07:24 2011 -0400

    merge from trunk

commit e7eeeabb3cdd9742edbf35c5eed275be86fd05a0
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:06:57 2011 -0500

    make sure network_size gets set

commit 590cca5bdd1b20573ead0a76de214e7e18a2aaba
Merge: 618d7dd 2304429
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 13:06:51 2011 -0400

    merge from trunk

commit ec95d2ea869074c797f413aa98fd11885fdd15c7
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:03:02 2011 -0500

    don't require ipv4

commit 99edf4d009d93ffb67e8022d6adf9d4a168e0ced
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 12:00:23 2011 -0500

    forgot the closing paren

commit 6367a90b94f04469616723ea151ada20a256efd6
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Aug 12 11:55:38 2011 -0500

    use subnet iteration from netaddr for subnet calculation

commit 4c5a51702511c4275b4f5f0655bae8b399a5c0a4
Merge: a6201a4 f020073
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 a6201a49afbe3e32b694f467fc35ed28b824ee1e
Merge: e305ecb 0ac4fa0
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 0ac4fa03c1c4e3d79e3cbbade8d783f4d2aacfd7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 12 11:44:49 2011 -0400

    rewriting parsing

commit f02007321266aa91d0b88e636e863f7ddfaf58c3
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

commit 332ba35a0132ea9e80fcadf8ae75ca5239c22a22
Merge: d4e9c68 e305ecb
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 10:34:45 2011 -0500

    Merged trunk.

commit e305ecb0cec567fae27a04bbd9b75cecc2325e80
Merge: 2304429 130a50d
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 d4e9c68008aef2e88c7fb7a92bd49ecbdfc38332
Merge: ee72c97 2304429
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 12 10:12:37 2011 -0500

    Merged trunk.

commit 2304429dbe5a62740c5539216726d3163a90448c
Merge: fb23930 1f88605
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Aug 12 15:04:13 2011 +0000

    Fixes pep8 issues in test_keypairs.py

commit 76bc35a1be579757dbf5d1f0daeafb3b2e7beb8d
Merge: 9f8066d fb23930
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 10:01:38 2011 -0500

    Merged trunk

commit 9f8066d4cff6518cd379908fc8fe88793c8fcaeb
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Aug 12 10:01:04 2011 -0500

    start of day

commit f11fed71cb6773ee294e44a7aab49afd280daa73
Author: Dan Prince <dan.prince@rackspace.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.

commit fb2393024356ffda04c71c8170960ed80e9884a5
Merge: 0f024eb 9c2beeb
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 1a5ea0030d25753d471624e4b03077a00234617b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 12 01:21:47 2011 -0700

    remove extra log statements

commit 9c2beeb985df502543f1f497463992abae259d11
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.

commit 21924f31cb278df166567943320646ade3fbefc0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:30:07 2011 -0700

    remove accidentally duplicated flag

commit 7326d83bcfaae82b4bec459296b40c43243194e2
Merge: 0744c7e 0f024eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:03:49 2011 -0700

    merged trunk

commit 0744c7e4dd55790aa5ccb39434263e2ac3b38695
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 11 21:03:37 2011 -0700

    add keystone middlewares for ec2 api

commit fd35954e1d9884b979f25b6fd718cdbed4ebecf2
Merge: b7bd0b3 0f024eb
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 18:23:49 2011 -0700

    Merged with trunk

commit b7bd0b3b7dd6abc6e4e2af2049ad6975ea827e28
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

commit b1faf64d356cbe8ef269eea35c2c6083e7ea5ad8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 18:11:59 2011 -0700

    Initial version

commit 5c1ed31cda043ececc6cbd913fb77f068105e709
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Thu Aug 11 17:59:41 2011 -0700

    Accidentally added inject_files to merge

commit 0f024eb655d733394da7b78659519f64fada4402
Merge: ab48cc9 99fee61
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 fb34f69f8f3ef7a7ac774073658f092aa464eb8c
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

commit 99fee617bccd30e8a68deb28df2a4c8f6bfca151
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

commit 9d5cf1ba657f703818d4ecc5a18cfe868b827aa7
Merge: 9947f4c ab48cc9
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Aug 11 16:52:36 2011 -0700

    Merged with trunk

commit ffa4953eef5b87c0d821ff6f507112bd15b8a392
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 16:32:51 2011 -0700

    Author added

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7db44872bc236f533246e5404a677a8fbde1c012
Author: termie <code@term.ie>
Date:   Thu Aug 11 16:26:26 2011 -0700

    allow scheduling topics to multiple drivers

commit ee72c973ec6728da5c4491136d51ac8764db85f5
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 11 17:10:25 2011 -0500

    Check compressed image size and PEP8 cleanup.

commit 8966bdc0e0c10ecbe849c25b515598349b997b97
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

commit 571c41b6cd529e4f3234d36ac7c8db918a624572
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 13:45:55 2011 -0700

    capabilities fix, run_as_root fix

commit ed04c6f231a836eb3a8312022c05560592b26ffc
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 13:18:30 2011 -0700

    lp824780: fixed typo in update_service_capabilities

commit 618d7dda6e8d71986a2b61be1f2c899c71f534cc
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:06:28 2011 -0400

    fix pep8

commit 1f886052d19b6bc91fffaef20e9557a6b73ad745
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:05:33 2011 -0400

    spacing fixes

commit c81487794977f01a715b7a5fbac00afc5b831fab
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 16:04:12 2011 -0400

    fixed pep8 issue

commit cef583910967a001c6709185d64e2a8d37a3b8a6
Merge: f77c033 ab48cc9
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Aug 11 15:49:58 2011 -0400

    merge from trunk

commit f77c033ad4ef5bedbf7998b160a48c6f7237e003
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

commit d2a5cca614939ffd83a958feda0b0b046408c34f
Merge: dcf6747 ab48cc9
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 12:31:09 2011 -0700

    merged with 1416

commit af9f38572682b8c0ed570f15e976d732872f2e8b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 11 15:30:43 2011 -0400

    fixing id parsing

commit dcf67474664c75af93347af6381c44e66ef19aa1
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Aug 11 12:04:03 2011 -0700

    moved vsa_id to metadata. Added search my meta

commit f474326884d000a3296a3e6d28982af04e1d623d
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.

commit 937be779ffe6ea31d1e7b2ea6c0e14eb7a20ac69
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b6c945d1e6234d61d20b2e1c82c95c3d7f2b93dc
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

commit 130a50d73477f4b85d95b3b82bd7e8614a9ef164
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 14:36:29 2011 -0400

    Silly fixes.

commit c9da2380533a68991863197a145a89a67a538a08
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

commit f7dd94627c83de85cc01fd657327e26833b81cf5
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.

commit 291fc2d92545e0223c9da18b63db3a31a806c57e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 14:20:18 2011 -0400

    minor cleanup

commit e08df3801079c13192956f5ac45440ffbe9c3154
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

commit d119016b706fb4d39eb32fe8e5e61ccbd11801f5
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

commit 9b4ea8f1a33ca40d02b2742a3fb9ff6a7ee54f86
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 12:02:05 2011 -0400

    More logging.

commit 5d1b6e528c5d159f5df5d0a3985ead7f83e678df
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 11:57:16 2011 -0400

    removed extra paren

commit 66f784bede7ed1a48adbf3f47a2ee90c564ee1f6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 11:55:02 2011 -0400

    Logging for SQLAlchemy type.

commit bc8c1ada99c6e6e6d4c777919f9624ad248bc4d0
Merge: acee113 ab48cc9
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Aug 11 11:28:11 2011 -0400

    merged trunk

commit 35dc64b71cf825ee4f22850c1fe48d808d9344c1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 11 10:53:40 2011 -0400

    Fixed per HACKING

commit ab48cc92f301bfa23b0923de85ad2a1de197b2e5
Merge: bbe3c19 0bb844c
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 0bb844c447da3ee6131e8e2258d78fe0d7336205
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

commit 55bfc868eb765719667e636c95d68bec9847b994
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

commit 5a6e1fe105fb8d63fe12bc8a1766274bd196bb4f
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Aug 10 16:19:21 2011 -0700

    removed typos, end of line chars

commit 9947f4c769a3bdc84be7281f13d8aa851efa5fc2
Merge: 36456bc bbe3c19
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 10 14:16:13 2011 -0700

    Fixed broken unit testcases

commit acee113c15440db2e49bbaa9883548b44965f388
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 16:20:31 2011 -0400

    Support for postgresql.

commit 4905ee2a673887d4d4985ddbf5a54fcaa21387c0
Merge: cebaa55 bbe3c19
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 15:49:17 2011 -0400

    merge from trunk

commit cebaa55bb6b494d584cd7e6ac85e17052cb6adb8
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 15:47:22 2011 -0400

    tenant_id -> project_id

commit bbe3c19836476face2b4653ad2e2f809ce29011d
Merge: d7dd39a 4d5ed77
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 10 19:08:35 2011 +0000

    Adding keypair support to the openstack contribute api

commit 75dac3b958dcdf5803a0df4b5164366dde8e0d01
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 15:06:04 2011 -0400

    elif and FLAG feedback

commit dc02f997d8e02097e5dc96fc19d54e6b42f9dccb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 10 14:03:16 2011 -0400

    Removed un-needed log line.

commit 6fc9a61c7e1f932dfdcde28893530dfe9cf5834b
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.

commit ece5239444b6dec2bdc2f9ebd45c0e5b4731e944
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 13:24:11 2011 -0400

    get last extension-based tests to pass

commit c9d57fa7c806b77413b37bf6d02a5c1888080550
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.

commit d7dd39adbbb73a70324d918fffa9d4b14cc8e5ce
Merge: e8478b3 5fd231b
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 5fd231b8e6acbc70cc090727222e0dcc524d3f36
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 10 11:25:38 2011 -0500

    Removed verbose debugging output when capabilities are reported.

commit dc0d09fa8a8342401f196ee5eb0a266ca999b7d1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 10 11:49:54 2011 -0400

    Updated extensions to use the TenantMapper

commit 982b12b78554442f1b67855b6063e888d323c10b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 11:37:44 2011 -0400

    fix pep8 issues

commit 3327b6476252316ca05107afca2cb2594db9fcf9
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Aug 10 11:23:40 2011 -0400

    Fixed metadata PUT routing

commit e8478b3d539ab9ccc6b772e51d7c339820ac4142
Merge: 741d931 b784178
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 741d9317da88ec657964fd6baac3fe7410cdbd50
Merge: 19c538e ab80281
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 ab802811c91914b5276a8c770313a62f8c6c4dfa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 10 10:16:59 2011 +0100

    Add bug reference

commit 946b0a2d75559679ea9eb78cc0836a491126aee9
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 files changed, 2 insertions(+), 1 deletions(-)

commit 19245dc6bfd71748a413a5bac3ab2d5ff5dd30a7
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 02:13:59 2011 -0400

    fix servers test issues and add a test

commit ea6ba3990d5976185e255497fc7cd90aaf7d43bb
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 02:01:03 2011 -0400

    added project_id for flavors requests links

commit bbe8184a409f2c2d0ece3d119622a103443615bf
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 01:44:15 2011 -0400

    added project_id for images requests

commit 9b6bd785d051c4e5374a945d7af0e894f1c4a96b
Merge: 508e0eb 19c538e
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Aug 10 01:18:44 2011 -0400

    merge trunk

commit 65e25be883faec72405ee6f81761048f7cdee37f
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Aug 9 18:43:18 2011 -0700

    fix so that the exception shows up in euca2ools  instead of UnknownError

commit deb45676d7797dd267456991a9ebbf3234595cf6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 18:14:41 2011 -0700

    Dropped vsa_id from instances

commit 4d5ed77e1c484ad259e442ac848b349334ed4e3a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 17:22:01 2011 -0700

    import formatting - thx

commit 36456bc7a477115a85e39e49022f5d5aefdd9935
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

commit e0e07c1c7c3feba62460125ae6fb1149b3916d9a
Merge: 9c8cb92 19c538e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 9 16:59:51 2011 -0700

    Merged with trunk

commit f558947a1ea782026ef01dc7dff14dc81fc420d3
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 16:55:51 2011 -0700

    merge with nova-1411. fixed

commit b784178e16bfff0fdd96a7e4b7a41b44cc8b57ce
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 19:35:40 2011 -0400

    pep8 fix

commit 4d308f709a4dc1beec479bd276fe20c1fd017c08
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 19:34:51 2011 -0400

    use correct variable name

commit 508e0ebdc7cf993f0bb0e1022717a09f230a7e5d
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

commit 0e9cddf5fd4df1f44c5e5f8043c4eede579ca8e1
Merge: 2c214a2 19c538e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Aug 9 16:26:12 2011 -0700

    Merged with trunk

commit 50bd0db1b2708ff3293d3257483048c761e0def1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 16:12:59 2011 -0700

    tests pass

commit 52c32130fda7636866cf41a4ef746a4415bb37d6
Merge: 819624a 19c538e
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 9 18:46:57 2011 -0400

    merge from trunk

commit 722a42521a72dd2613f7f242b82a09d9ea045cda
Merge: af04d74 19c538e
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Aug 9 15:21:46 2011 -0700

    merged with nova-1411

commit 19c538e7ac665abdb37cd09ec6756b8fe86c19c2
Merge: e677ef0 8c91e3b
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 af04d7400346c39f0ea0a1ddcc0b29660be17fe2
Merge: 67f6f57 17169d2
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 8c91e3b2271d9bbd35b1cd63908cf171900b1593
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 9 14:45:31 2011 -0700

    adding other emails to mailmap

 .mailmap |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit eb6cb3b1ec39cabd7aa49255a47659e4951d52f3
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 14:23:30 2011 -0700

    add Keypairs to test_extensions

commit d6672405dc3d555e7fb25080578810e546d7086e
Merge: b805193 ee45b22
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Aug 9 22:20:53 2011 +0100

    Merge trunk

commit 2cd1be63e20598a2cdbfbcc14bd5487f1b4ee6c5
Author: Jake Dahn <jake@ansolabs.com>
Date:   Tue Aug 9 14:17:56 2011 -0700

    adding myself to authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e677ef00d98a18cbd9535e11d8bcfac21c4e511b
Merge: e6c102b 2506588
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 e6c102b779ba49fd657c315b0250d853e7c2c523
Merge: dfff241 29caa14
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 ab6ec998fdc2e91fb94e495ffb2c5788556819d0
Author: Dan Prince <dan.prince@rackspace.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.

commit 5ab4a793f069a8487bc2fcb71456834147d344f4
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

commit 70134506231ba4afbd84b3f1ab0e0ec0bd5bb537
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 9 11:31:48 2011 -0700

    initial port

commit 81ccea29964e43a2cac028d9e98915b90d702fb5
Merge: 1db206a dfff241
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 13:38:09 2011 -0400

    merged trunk

commit 29caa148e208aeea74ba9af234ea7ac4a489f409
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

commit 1db206a7bc8c1286fd48e4b3de91501e6657401f
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

commit dfff2416e0950a52b5e83a15f39c2f754fb58e49
Merge: 817faf2 5e8cf2f
Author: Dan Prince <dan.prince@rackspace.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 817faf2664375247d1a9aff0fdefebc322f2263e
Merge: 1fe389d 3f89f78
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 16:12:59 2011 +0000

    Fix pep8 error.

commit 3f89f7893330934aa32eb30baf3244501f759a77
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 11:47:46 2011 -0400

    fixing one pep8 failure

commit 1fe389db10f2ec0219b5dc3f0f271c5104ffa711
Merge: 0145c77 7f79500
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 0145c7754498ff682ff6983932f1711cd5c74ebc
Merge: 1605c5d 9cebb86
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 15:34:32 2011 +0000

    Adds missing nova/api/openstack/schemas to tarball

commit 1605c5dfa83c749f51b580d60452fb95269cb901
Merge: a88c94e f320f55
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 9cab97dedab9a7d395d6815c39bcb50941041ada
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

commit f320f559a34ad6f5e2ed8fd6a18fbc4e37d6e34c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 11:10:14 2011 -0400

    making usage of 'delete' argument more clear

commit a88c94ecfeeaf5b5f7303f7898ac0f4690d9ff96
Merge: 98945b8 6aba076
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 6aba076bed6846f31ec0f6bc7e730f28642623af
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 15:44:43 2011 +0100

    Fix remaining two pep8 violations

commit fe4c8ae9da1328a3315367b28f52de28e4dc2679
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 9 10:29:56 2011 -0400

    Updated TenantMapper to handle resources with parent resources

commit 8b01091d86af21b29f911abca199ab26f11a9419
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 10:29:07 2011 -0400

    updating tests; fixing create output; review fixes

commit 98945b8076b673374a13ea1c707d6cfe8ef102a8
Merge: ee45b22 d423ad5
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 9cebb86a0251a2f0bced480fc9c95dd2d6a13010
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 files changed, 1 insertions(+), 0 deletions(-)

commit 2c778ce06262911f3203f8f2f3f3193c70532895
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 14:11:15 2011 +0100

    Rename sudo_helper FLAG into root_helper

commit 160b2a9cff074ffbcee6d8653ee3b73483a7df02
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 13:47:55 2011 +0100

    Minor fix to reduce diff

commit ee45b2207a53d8df0af32a2909d25db460680b83
Merge: aac11b1 a155672
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Tue Aug 9 12:47:47 2011 +0000

    Initial validation for ec2 security groups name.

commit 380356820fd5384d6989c13e51694dd0790798e0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Aug 9 13:34:54 2011 +0100

    Remove old commented line

commit 75926e6b3fe9a5c0faa41d7a637ae7ecf6d604a9
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

commit 8789e003c59bd687e4d34109700d3c99843bd17e
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

commit cd2b6981d20588df5393ac8ff4e54b1e8fd2dca4
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

commit 9e281fbfd624f4731b1bd895752c68a744bd8fda
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

commit aac11b1181089c73d062c8bdbeec19da81c8d218
Merge: eb321e4 5b71b23
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 eb321e4730f81dc601b125419d4a66874e9d7fff
Merge: 67c3f34 68ffbbb
Author: Dan Prince <dan.prince@rackspace.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 d423ad5fe62b3eff036b406e69738a33d05fc67a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 00:47:16 2011 -0400

    updating more test cases

commit fa360195a72eb494f76c1997411cf58a121355e5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 9 00:27:28 2011 -0400

    changing server create response to 202

commit 67c3f34896309de2611799fe25c7a61f50e29005
Merge: 57eac72 0791cc2
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 0791cc21af4389f43b69de960df6d0d07bcc58c6
Merge: 5f2e907 57eac72
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 8 20:25:31 2011 -0400

    Merge from trunk.

commit 5f2e907790e96eb8aa519abb8fa44a26dfa45f37
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 8 20:23:15 2011 -0400

    Fixing a bug in nova.utils.novadir()

commit 57eac72f33803e5ae00482542782178c667f2501
Merge: 600d831 a1acfaa
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 7f795006534015f14f0f95bc38eeeec471acc5d1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Aug 8 15:33:17 2011 -0700

    fixed conditional because jk0 is very picky :)

commit a1acfaa4c58667db12ef1654dba705aa65f7f576
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 21:46:33 2011 +0000

    Fixed typo found in review

commit 058ca11fcae993bbd410b68caa83b1c74416b1dd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 17:44:58 2011 -0400

    removing log lines

commit 7045a4bba9e95d4fff901f1fc3d78fa7466a412d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Aug 8 14:43:52 2011 -0700

    added --purge optparse for flavor delete

commit 46939aeaaa1c21f54cce543742ddd3c2b3fda232
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 17:33:03 2011 -0400

    making server metadata work functionally

commit e2fc380ec236dde6d2b01c8a809b614f613e4ec1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Aug 8 16:38:14 2011 -0400

    cleaning up instance metadata api code

commit 08cd34ea0ad2652ad56f6fa3c60e5f497b344c7e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 16:36:17 2011 -0400

    Updated servers tests to use tenant id

commit 600d831ca64e0b8af1c393393372ba0da3caa0d3
Merge: 55177f0 04af091
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 8 20:17:48 2011 +0000

    Set image progress to 100 if the image is active.

commit b90fa957d87581c531bdb37300a3f2d7bd0256c6
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:12:35 2011 +0000

    Cleaned up merge messes.

commit b44d0ec8ea9a06fa2ba3b0619e587088464c2ab5
Merge: ad35396 55177f0
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:06:54 2011 +0000

    Merged trunk.

commit ad353965b112b4712262a81d7e63ef6d7cb662c2
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 20:03:14 2011 +0000

    cleaned up unneeded line

commit 55177f05616f61d91957f6deb39a6c820314de16
Merge: 3d91618 70a716b
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 819624a69f20ca9c85b91c08a2b074382613f1ce
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 files changed, 0 insertions(+), 1 deletions(-)

commit 56c0827cc0dbf4af5037e4dbe1e997a343f32bbe
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Mon Aug 8 15:30:44 2011 -0400

    assert that vmops.revert_migration is called

commit 70a716b7592895934ada64d75fffa23a18f57ee9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Aug 8 19:28:42 2011 +0000

    Import sys as well

commit 2c214a2dbcf031963b20e3d822378730ea423b53
Merge: 83dd7b8 17169d2
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 3d91618a9c9b4553cdd3afec46c04ce77e9322e4
Merge: eda242b 0969af3
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 85f51deef8a19a898842a6bf47074ee1268c39a6
Author: Jake Dahn <jake@ansolabs.com>
Date:   Mon Aug 8 12:10:14 2011 -0700

    adding forgotten import for logging

commit eda242bf8b2892bf52de13452a12a3d8f8b9a1c4
Merge: 17169d2 367d2c5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 8 19:05:09 2011 +0000

    Adds OS API 1.1 support

commit 80927466eb8897af5a0b1643792feef7d9a8d3b6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 13:54:18 2011 -0400

    Updated test_images to use tenant ids

commit d1ae130b10e580dfc34895a92207405109eb3efe
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

commit 0969af3bead5201c494478d70132569b29e2528a
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 17:34:42 2011 +0000

    Review fixes

commit bdcb4060d682d48a351505fd03db41dd99b6f4e7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 13:34:20 2011 -0400

    fixed wrong syntax

commit c2bc0841f00e236f60a4095faca74260c0034171
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Aug 8 12:57:38 2011 -0400

    Assign tenant id in nova.context

commit 367d2c54ca32431816f738a46c072f76e233157d
Merge: e4ca649 17169d2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Aug 8 09:12:56 2011 -0700

    another trunk merge

commit ae0e90ed87fb0045999d36d66c4fdc571beb31af
Merge: bdfca71 59a33e7
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 15:34:04 2011 +0000

    Merged trunk

commit bdfca71d6d6e6a77b783faff3ab79f475080111b
Merge: 6ca26f7 17169d2
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 15:31:29 2011 +0000

    Merged trunk

commit 023fcc85169b3fcfa1e33f661a721fcadf451683
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

commit 3400b92049b8c9553ca013c096c5bd7c1cf554bc
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:42:18 2011 +0000

    Fixed some typos from the last refactoring

commit 7cefc3d513d6a71af9923afb7c75548cbb98bbab
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.:

commit 058c38ee0b77fb0c3314840c63200f8be0641fc7
Merge: 73e3e7b 17169d2
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 04af09139bfb281b3d20cb8bcfb5def2ebe23c11
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Aug 8 10:12:01 2011 -0400

    upper() is even better.

commit 67f6f57121197b776dff5d072e68cca75fe71bc3
Merge: 3613ed9 84af84c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Aug 8 07:10:12 2011 -0700

    merged with 1383

commit 73f8c2ec2d02c87e9cc10f828a5023f72b8c373a
Merge: 7491506 c6df4ec
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 14:07:03 2011 +0000

    Updated with code changes on LP

commit 7491506d3c681165ee198b0fdbeb2db32b9b8228
Merge: 864cf4e 17169d2
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 8 13:55:04 2011 +0000

    Merged trunk

commit af4adc084be806cbdebee616bf2ddce85585e669
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

commit b7b9b56c5503c367674f283140b6dc36b4707ee2
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun Aug 7 22:05:01 2011 -0400

    Adding __init__.py files

commit 17169d26f1c34a7db20b89641ed5d439f2d55b7f
Merge: 23c5ebc 5c7dba6
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 73e3e7bb9aede96dcf9ac81274ecb7395c1e0859
Merge: 9c3c5b8 23c5ebc
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Sun Aug 7 21:42:46 2011 +0100

    Sync trunk

commit 63a33947fbd75b9a5e33d84c0129388d385a98c8
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sun Aug 7 16:40:07 2011 -0400

    Set image progress to 100 if the image is active.

commit 9c3c5b86351e6b991049e459f87a90584b3e42a5
Merge: 9d1f973 84af84c
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Sun Aug 7 20:54:26 2011 +0100

    Sync trunk

commit 68ffbbb9c91ff88bebc043e559886887ef808462
Author: Dan Prince <dan.prince@rackspace.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.

commit 5e8cf2fff0ebf2ad8ee17f4b5c0010b770cd9342
Merge: 3c8f357 23c5ebc
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat Aug 6 20:42:33 2011 -0400

    Merge w/ trunk. Fix pep8 fix conflict.

commit 23c5ebcd5dde7de9bda400f94dcb88238f47572b
Merge: 007bbf5 bc96d98
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 a15567270bd0f09bebee04db92e4e719f99d9efb
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Sat Aug 6 20:18:35 2011 +0100

    simplified test cases further, thanks to trunk changes

commit 8bf5060ddca2b47ff076f3b3dd77188d292fd4cd
Merge: 3e35c12 007bbf5
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Sat Aug 6 19:08:08 2011 +0100

    Merge with trunk, resolving merge conflict

commit 007bbf5fe18dcc8e3f7e0203659ff8936ad66bd7
Merge: 3a4c4c7 a67c5d7
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 3c8f357ca93b30adb247f6499234215ab85a6bf8
Author: Dan Prince <dan.prince@rackspace.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.

commit 5c7dba63bb40e8b83f4323d59ebf593fac5bc3d6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 18:51:17 2011 -0500

    Pep8 fix

commit bc96d98a27e2660f8d1e0f927252fa833d270b34
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

commit 08879d14821392308076a7d3e1011b8cf151c8a6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 23:26:08 2011 +0000

    Adding check to stub method

commit a60bcf0304a88c3a49b563811de01fcb2cee479f
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

commit 3a4c4c7b82ff9eed8a5308787f2105c3e6b3af63
Merge: 317c06b 640cdb0
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 ac8b9dbb38e6f7b4807818790cfc72f469cf3196
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:56:08 2011 +0000

    Using decorator for snapshots enabled check

commit f1476f816f9e1228e7553486b959531220bcf4ac
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:29:28 2011 +0000

    Disable flag for V1 Openstack API

commit 54f48278a99a0aacd4c7c42fbf7adf0664135f31
Author: Jake Dahn <jake@ansolabs.com>
Date:   Fri Aug 5 15:28:10 2011 -0700

    adding logging to exception in delete method

commit 640cdb0b73cd742abe9f62c7841bdef13d46161a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 5 15:25:12 2011 -0700

    Pass a real context object into image service calls

commit abaa311131832a5f2d7eb1b90ae69cad294d3267
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 22:14:15 2011 +0000

    Adding flag around image-create for v1.0

commit 83dd7b87b694ffcf5cc83fca23e575e4e299773e
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

commit 7b843facc66ce14c72b740d47033256a444e79e8
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

commit 317c06b32a003eccf3307d0d00fa467fd253b6b9
Merge: c80dbea 7d1e11d
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 c80dbeac77e679e4105b3a7cb8568d36ab59b6f1
Merge: 3d33e30 059aee2
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 5 19:47:52 2011 +0000

    Allow actions queries by UUID and PEP8 fixes.

commit 9c8cb92f50a605bbfd44d8f3a3455a3289ff4193
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 5 12:43:27 2011 -0700

    Fixed localization review comment

commit 059aee20f155746ccbaec44dacb334ee72d209a7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Aug 5 14:28:22 2011 -0500

    Allow actions queries by UUID and PEP8 fixes.

commit b5b6e4f164e262dd74de44a8d0e10c41d993d0c6
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Aug 5 12:09:46 2011 -0700

    Fixed review comments

commit 7d1e11de5161e049784d217eb6c252b1a6e82e5a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 15:02:18 2011 -0400

    fixing filters get

commit 85c2d222120e8f2e27f0da4c7ff6dcf416f2caec
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Aug 5 11:48:06 2011 -0700

    fixed per peer review

commit 6f28d54f337d5a1853f2d908ddef871d83b7e8c7
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Aug 5 11:36:00 2011 -0700

    fixed per peer review

commit 8cb9560b1e2e5c8ebcd4bb3849c794c1458d36e2
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

commit 3d33e3042d4f4b04ca08eaaadbc2fb5fc332cf87
Merge: 30d3861 b547061
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 30d38619d8b68e7095967532faa0ad6d9cd3df48
Merge: e16e648 4adec46
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 e16e648c6107bd3d76a88b1259fd3840766c5df7
Merge: 84af84c 7de7fd0
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 3613ed9b4fe39ef28cdd1dc5ccf0467d70d625fc
Merge: 56788f5 ea81854
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Aug 5 09:59:28 2011 -0700

    merged with 1382

commit 84af84c1ecc16aefe245084f9a565c0d2044362a
Merge: ea81854 fe21916
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 1a8edb0943132d0e16619cbd6ad78891d69bf582
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Aug 5 09:50:11 2011 -0700

    fix typo

commit fe21916f366a85bcc206625f94a4254808101075
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:22:21 2011 +0000

    Moving from assertDictEqual to assertDictMatch

commit 5ff370837eda2ed760411d04da52a7d30e26a66c
Merge: 476df70 ea81854
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:13:59 2011 +0000

    merging trunk

commit 476df70515b05e3df0142456326625b4a750a39c
Merge: 2763c2a 860a5f0
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 16:13:44 2011 +0000

    merging trunk

commit ea81854b49f2d01b58b31651b4d149f01bee483c
Merge: 860a5f0 ba8d6ea
Author: Dan Prince <dan.prince@rackspace.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 e7127a28dbe521b5ef7db90eeec69c0c400b3b51
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 12:00:13 2011 -0400

    adding --fixes

commit f3dc545cadaaeada7a590b1f07ebf6cd469b950c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Aug 5 11:59:14 2011 -0400

    glance image service pagination

commit a308e4e8e53a9f7334eb4cfe910f8e9a330a9b5b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Aug 5 11:58:21 2011 -0400

    Pass tenant ids through on on requests

commit a67c5d76a9e40c0e2c4bd1d84c2314bf393eaeb3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 19:45:17 2011 +0400

    methods renamed

commit ba8d6eae999a61d53b67fd1d34ea11e6d2df0a1a
Author: Dan Prince <dan.prince@rackspace.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.

commit 9d1f97313288b917282e68026b87a045390e44a0
Merge: 2aa1616 860a5f0
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 15:37:07 2011 +0100

    Merge to trunk.

commit 3716151c1dd39b3b150bf834c6f79a17068c5ee5
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

commit e4ca6499fbda35ba197857619056de3128d368ea
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:21:55 2011 -0700

    pep8 violations sneaking into trunk?

commit bb891cdd58d8146c2625815b930d91ea90e7338d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:19:35 2011 -0700

    pep8 violations sneaking into trunk?

commit 86784aefd46faeb08920cf4630dad4c1a21b1bf9
Merge: b200878 860a5f0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Aug 5 07:13:52 2011 -0700

    trunk merge

commit 860a5f0d9fe202d6be939018bb77ac03dc913057
Merge: b6a2a48 c832442
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 4adec46dbd9366fd046a5d11193faa41bf84fa8f
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.

commit 520794b3db07f3ced94140a164939c492b981169
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 15:37:36 2011 +0200

    pep8

commit b2008781bd4c9f45662ff905c3e7a2c46c0c6999
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

commit a86aeb5b87ee199668d02d5b0feb40d7edc1198c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 5 14:54:56 2011 +0200

    Add generic image service tests.

commit ddc8662ec9cc49d2015cc47ff28474cc4d1dd33b
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

commit 12bd49ce980b61f5bc56ad785b36f84feeb85efc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Aug 5 14:02:55 2011 +0200

    Remove spurious direct use of subprocess

commit 8429d3fd4fd9391cc0561bc9fa1c9fa4ff27442d
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 5 18:29:32 2011 +0900

    Added virtual interfaces REST API extension controller

commit 2aa16160a45f498e925e8b2ca633103757dfe1d1
Merge: cdfce63 b6a2a48
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 09:51:50 2011 +0100

    Trunk contained PEP8 errors.  Fixed.

commit cdfce632d609be3b5300d8d499199b58eb6d6973
Merge: 95597f9 2e20cb9
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri Aug 5 09:29:40 2011 +0100

    Trunk merge.

commit 5b71b23be31620f253b616f0a6ddd7a0102b6296
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Aug 5 15:23:54 2011 +0900

    fix mismerge

commit 2bd75eea4530e5452edf591de87735aab06b5321
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

commit 393c98a7c456ea982d685770b8a3129aab1c0c00
Merge: 54876f7 b6a2a48
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Aug 5 14:59:33 2011 +0900

    merged trunk

commit 19275467ee460ffd70379f72ba1b0ced8473947f
Merge: 3cb3db2 b6a2a48
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Aug 5 14:06:22 2011 +0900

    merged with nova trunk.

commit 10bc215a3da035df168ed89050c6b55dd252d1db
Author: Launchpad Translations on behalf of nova-core <>
Date:   Fri Aug 5 04:47:13 2011 +0000

    Launchpad automatic translations update.

commit 7de7fd0e3a050899e7167ddff0762ff2012c4a0e
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 23:01:22 2011 -0500

    fixed pep8 issue

commit 60009f8c7e8ce4be21d13c65cf04845d867922cd
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 22:59:36 2011 -0500

    utilized functools.wraps

commit 972d9afe26f8625c56b85a44a083821b16889eec
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 07:55:22 2011 +0400

    added missing tests

commit 49886a76f90da1b76e8d8b06cfa3ed105ab72372
Merge: cea4e7a b6a2a48
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Aug 5 07:49:29 2011 +0400

    tests and merge with trunk

commit 5d968c7fb002fd9e5afd978d4535586dc3b9e447
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Aug 4 20:13:23 2011 -0700

    removed redundant logic

commit 1665772dbb422af2a1100b220c999dc1ca3cd8ed
Merge: 4cded4e b6a2a48
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Aug 4 19:43:33 2011 -0700

    merged trunk

commit b6a2a48d094cf1dc6e6c77abdfb59c17f2778c02
Merge: 4311502 971481e
Author: John Tran <jtran@attinteractive.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 431150259fa7b425083b997dc3af916093507573
Merge: 342cbcc ae14f94
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 342cbccada880414e9b477335ca52e75a5853575
Merge: 6a7955e 17d1b0b
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 2763c2a10c06fee494422f212a4fd1a47da08e57
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

commit 4cded4e8bd2128db186fe399cf3868aa3b84ee47
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Aug 4 18:52:15 2011 -0700

    fix pep8 issues

commit 6e9bbc005ca7472eb819da59bb3b33dcb85d5565
Author: John Tran <jtran@attinteractive.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

commit c4b0542427b7767cafbf24eb8bb9b2d81368c736
Merge: 660c862 6a7955e
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:29:39 2011 +0000

    Merge from trunk

commit c933a9e7486485cb945f6c9e4e7c4ec4d625734b
Merge: a025d0e 6a7955e
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:24:37 2011 +0000

    Merge with trunk

commit a025d0e40f4f46631cbecc0b8bb93041fbd2997e
Author: Gabe Westmaas <gabe.westmaas@rackspace.com>
Date:   Fri Aug 5 01:07:53 2011 +0000

    Adding missing module xmlutil

commit e3907b43d8fbad18b00e8f6cc992a7011c891314
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Aug 4 18:01:07 2011 -0700

    fixed bug, wasn't detecting smaller subnet conflict properly added test for it

commit b5470616441fb7ffe8ab64e92e82d40cf7501d61
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)

commit 17d1b0b96040ebaae71a5c5c354dda3ae9097b85
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Aug 5 00:12:19 2011 +0000

    Read response to reset HTTPConnection state machine

commit 8a190a98c4baa0cbd1bf609e31e72359c05f0c44
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Aug 4 16:27:55 2011 -0700

    removed unnecessary context from test I had left there from prior

commit 37b5c3e6acc9a2c4fd74767c70957095bb670474
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

commit 59f63f511a226a8b155aa7c860352410931ccc97
Author: John Tran <jtran@attinteractive.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

commit c8324428839ceffe5f5f6d174ce919803e509c2b
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 4 22:18:52 2011 +0000

    Revert migration now finishes

commit 6a7955e224e1c90f8fe688f356c386d0a53dd4ba
Merge: 26b8f2a bfff7aa
Author: Dan Prince <dan.prince@rackspace.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 26b8f2aafa3bfc02a91a25394a190ed8dcad62f5
Merge: c5efe44 ee67d31
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 86c6aa6a6ed502b45d2cd13a66da468ed0df522e
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Aug 4 21:26:21 2011 +0000

    Bad method call

commit 4fc7c99f1ee0d9c64e54cfe7017642ebe4511b71
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

commit 59a33e7e1b4554b596c9a4f2a9b5a90b83399b01
Merge: 0403214 c6df4ec
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 21:17:21 2011 +0000

    Merged in the power action changes

commit 04032141accffa2d0f89f477e9765cc18bc03951
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 21:10:22 2011 +0000

    Removed test show() method

commit c5efe447c9b2407f0c246cc08a7dd719e60bccbe
Merge: e7f9ebe 8561c3b
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 e7f9ebe81c79e8b63c72e85ec1de3e7c7bb5d3ac
Merge: ef78d90 9d4d276
Author: Dan Prince <dan.prince@rackspace.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 c6df4ec333cdc954597de9ed2ad696b7b1b0f813
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 20:55:56 2011 +0000

    Added admin-only decorator

commit ef78d90ae640ce0199329af818a77316c5401a05
Merge: b328d93 62dc8d5
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 ff7996cd1652450934df17c02374735f46e7ebb2
Merge: 8885216 b328d93
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 20:49:31 2011 +0000

    Merged trunk

commit 8885216025c6162158232b34e9d15d9bbb4e1358
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.

commit 660c862c331044fcf72eeb429a9804de7c162b8a
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

commit 8561c3b62987c80a12e4f4ca6048d71737cbee27
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:31:18 2011 -0500

    Added more informative docstring.

commit 3639ae9dc2c068347d569830036491206182e6c5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 16:26:31 2011 -0400

    Added XML serialization for server actions

commit 3e8318374970b9df7405d4f5cac5d33d7524dc88
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:22:36 2011 -0500

    Removed debugging code.

commit 01098e89454789c3fce2fdd3579b03412cc82712
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

commit b328d935c86bcfd76cc6655210f439ef636fe291
Merge: ff3f208 4e5d3db
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 818497e94d33b4d12dfb85cdaa840c66ff99d4a1
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 15:16:42 2011 -0500

    Fixed rescue unit tests.

commit 4442f70fd862539bca43566e7ae79111fd5ca01d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Aug 4 16:02:28 2011 -0400

    Nuke hostname. We don't use it.

commit 95660ab5a57f6e8c587f236bef80e410ad69f5bb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Aug 4 15:51:41 2011 -0400

    Split serverXMLDeserializers into v1.0 and v1.1

commit cde91c44649018c8cc772403ff4b324ff9532d98
Merge: dcee66f 2c5a331
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 4 12:45:29 2011 -0700

    another merge

commit 057c620c7d30214b87918b4867c968d6d61c0475
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 14:41:54 2011 -0500

    Removed temporary debugging raise.

commit 40389ee90d0d63d183b6ad3a8b82d547ae67858f
Merge: 279d3d8 ff3f208
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:36:29 2011 +0000

    Merged trunk

commit dcee66f9ec17aa2fb6f299360cf1f75749bdb3b8
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Aug 4 12:36:11 2011 -0700

    modify _setup_network for flatDHCP as well

commit aaf3e27b90da4fc106d13422b7b48988960a955b
Merge: 7d39558 ff3f208
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:33:02 2011 +0000

    Merged trunk

commit 7d395587a64460a678c431d2271a30ba46f10134
Merge: 6ca26f7 279d3d8
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 19:32:10 2011 +0000

    Added xenhost config get/setting.

commit ae14f94a0471701d97e679973b293e26f6cab5af
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Aug 4 15:30:39 2011 -0400

    fix syntax error

commit 27a601f8a3ed7308bc50357f04f486ed7e9ba0f3
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 14:30:12 2011 -0500

    Fixed rescue and unrescue.

commit ee67d31e400cf961e0a690f2dfaabb876d10fd33
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:21:09 2011 -0700

    remove storing original flags verbosity

commit dbbf557962f0c6bc125d215c5d1e85e3589e6f1a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:07:07 2011 -0700

    remove set_flags_verbosity.. it's not needed

commit cac663169f59e59e123ad4380580b752fb3aff69
Merge: 4f88bf9 ff3f208
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 12:03:36 2011 -0700

    Merged trunk

commit 135b665c1b9790c10b79b1ccd9a4d1e2bb6a0157
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

commit b74d75a5b4a24c52e8b42674613743639d514205
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Aug 4 11:40:07 2011 -0700

    added NOVA_VERSION to novarc

commit 5542e91ebaba599ee395d31040dcd8cac887de44
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Aug 4 14:37:24 2011 -0400

    remove unused reference to exception object

commit ff3f20864369a942d3436a53c462951d7e5bdb56
Merge: 2e20cb9 71ccb8b
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 95597f9eb74037af2130a9549c15ae62d5a06e39
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 18:48:31 2011 +0100

    Fix comments.

commit 7efa225721caf31c42304bd0b8d13f7ffa9f7c67
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)

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 62dc8d5c83f817b4bf03001ea17f69e97719bc6a
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2e20cb96e1fc1233637cbfd4e488855c8764049c
Merge: 12fc511 2b6ac7b
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 4f88bf9e21316454f111b2ee507115ed3a140855
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:34:36 2011 -0700

    fix pep8 issues that are in trunk

commit c80762384e1316e7a8fab8b5d47615ba72886e7e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:17:55 2011 -0700

    test_host_filter setUp needs to call its super

commit 756f747be01d97aac8c250f2580a0c693eef7882
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

commit 596ef77bd21d8af44bfb89c58a5dc143b74fb127
Merge: 1454c3f 12fc511
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 10:01:52 2011 -0700

    merged trunk

commit 3b39d5d2a6242c8073f2efffce3bad737813c0b9
Merge: bdd09f3 12fc511
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 2b6ac7b2bd441eb2bc2cb9459f28ed7e4ef4e105
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 12:48:13 2011 -0400

    fixing typo

commit bdd09f3c23aae4a65dee28ff639cffb2c518f672
Merge: e1f4d2e c56994c
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 17:39:56 2011 +0100

    Sync with latest tests.

commit 12fc511cefaef4cd620c4efd6a835f4c3a796de4
Merge: 0009950 a4e5c21
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 00099505295577b5b1d974f0a3bc9a32ccf6432d
Merge: a3a1e73 a61fbdc
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 a3a1e73e8c21ee4f447f669a5e5c8b120fe2c1f4
Merge: c56994c 4e35ad7
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 c56994cb4570ddbbf0b09d46ac4a571b70959a9c
Merge: 9fc69f7 a7c1f68
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 084f33c58cdc966b883a9d783dac7ff6f2ae471d
Merge: 58160a4 9fc69f7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Aug 4 11:50:57 2011 -0400

    merging trunk

commit 71ccb8b54806394fc29a9fc21ec28815ed93a3b9
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

commit 9fc69f7c15ce07f28dac2c50bd4dd81e83594924
Merge: 459773c 08d1aff
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 e1f4d2ed62ab3ced99fee0f9d5ffb3a4687c03a6
Merge: a996ae5 459773c
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Aug 4 16:40:10 2011 +0100

    Merge with trunk.

commit bfff7aafaf6a8d178f16d93aedb7a1e26ee17e09
Author: Dan Prince <dan.prince@rackspace.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.

commit a61fbdcc723f6d43d80addc7201bd0714f5aa274
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Aug 4 15:03:29 2011 +0000

    Linked to bug

commit 53a3bc2581547e7220cad52a9e5a19b19c027aac
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.

commit 9d4d27649869cc192ea6abb221a7031f45977722
Author: Dan Prince <dan.prince@rackspace.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.

commit 3acb206edeb16cdccf07fc64b7e94f29026f66c3
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 09:40:51 2011 -0500

    Fixed rescue and unrescue.

commit e8583ecac52d881d6164baa0f327ef0a2ac33d00
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Aug 4 09:29:43 2011 -0500

    Added in tests that verify tests are skipped appropriately.

commit dd64772395c6db0c26e8919972e3d37fc4f88488
Merge: 4b06c38 459773c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 08:28:16 2011 -0500

    Merged trunk.

commit 4b06c3810acaa424f6f030924573416932208330
Merge: d37e9d2 e281a40
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Aug 4 08:27:45 2011 -0500

    Merged dietz' branch.

commit 459773c8bad649e223992f98692557a516b986c0
Merge: 4a9fe4a 90fb46c
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 4a9fe4a2db4dc5ca7a4c7abddf1aaf7a70e7a02f
Merge: 9398eec 2bdde85
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Aug 4 12:45:15 2011 +0000

    Pep8 cleanup

commit 9398eec25a29e2d19848c4e3462c105c00faadd2
Merge: 274480d dd5ba11
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 274480d9d8d43dee59e3163df869f3ac4613c3b9
Merge: 54876f7 e281a40
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 a4e5c215274b0e5b0708643e4b9d6ce4209b3d77
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

commit 512209815dbb0f772721b5a0c15c6541f223bd3d
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

commit 51cea15130ba526c50b3ee5c98f76c1014ddaa47
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 20:26:37 2011 -0400

    fix pylint W0102 errors.

commit 094b83ce8e23666c314fd84e17410726c6d2eddc
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

commit 2323783f067fafb5b4a421aca47c9a1cc953f11d
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.

commit 4e5d3dbcba33e940e22b55ac44c98f3ab8783039
Author: matt.dietz@rackspace.com <>
Date:   Wed Aug 3 17:39:51 2011 -0500

    Fixes lp819397

commit 04af3f74238a89207ce1706839806d2906b023c9
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Aug 3 15:03:34 2011 -0700

    Initial version

commit 08d1affad480308cb04f70589ae4c4d4341cf161
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 21:44:03 2011 +0000

    Load instance_types in downgrade method too

commit 42a5aafbf182c3ea1b5aa7f0a98b470aedf0f330
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 21:43:48 2011 +0000

    Fix trailing whitespace (PEP8)

commit 1454c3f746fd3bc239b4c6dbc69ea9ead6989549
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:13:37 2011 -0700

    fix test_cloud FLAGS setting

commit ddaa2c49b7850d97b3787349c4f7e42e42bdf639
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:11:37 2011 -0700

    dist scheduler flag setting fixes

commit 0a5b7577411876e3d832a381e96c016043414729
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:08:22 2011 -0700

    fix scheduler tests that set FLAGS

commit bfdb25836f5b7db67d851f91f60914e793c4c960
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 14:06:56 2011 -0700

    fix more tests that use FLAGS setting

commit 68a3efe5eaeff52b7fe0867b8db3e1c22b66ef1a
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.

commit 7dccb69840a29e6a1f12037ab0a336fbdd9a8d04
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 16:45:46 2011 -0400

    align multi-line string

commit 70bad9b59328ffa4a257da1427c5bc72b547d417
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 12:26:51 2011 -0700

    fix test_s3 FLAGS uses

commit c75f72415fab80bfcd85285b894a20e9527aeb48
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

commit 7c13eba2771d2b8bafa097a3824f674557dde8fe
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 15:16:38 2011 -0400

    follow convention when raising exceptions

commit 8aeac871f5b3ae7ff808444e0bd374c61ef43d46
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 15:05:57 2011 -0400

    pep8 fixes

commit 612b58d2cb697955c0883c652bfbe1357ae9fdb2
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:51:47 2011 -0400

    use an existing exception

commit b21446dc9e44acbc0abbfcf81682c9770fc78b48
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:49:14 2011 -0400

    use correct exception name

commit 075a04d7328877a169c94630ea43fe320c032e49
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:47:35 2011 -0400

    fix duplicate function name

commit 0867ccc6fd1d72f0cc095227f1282761521ada45
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:46:02 2011 -0400

    fix undefined variable error

commit fd52a89fd4d1f565c84b707c7b508ca84ed62701
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.

commit 54bba2030ce6140757a24236df3eaf5685f9d9af
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:13:53 2011 -0400

    remove unused imports

commit 555b46f534374d377f971de9084a78f74f67bdd5
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Aug 3 14:05:58 2011 -0400

    remove bit-rotted code.
    
    fixes #820062

commit 6eb1dae38051caf284641fffa5e5c162986c5ab4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 10:11:20 2011 -0700

    more cleanup of API tests regarding FLAGS

commit 0ff4c8a07481b6071c1c094cbc6387de6195fc3b
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

commit e281a40fb07117bdf7b60e052dd2b9145519d9ff
Author: matt.dietz@rackspace.com <>
Date:   Wed Aug 3 11:48:50 2011 -0500

    Removes extraneous body argument from server controller methods

commit 6ca26f77719de398bdaeb07fef928d9e4ebca457
Merge: 5c66485 54876f7
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 16:39:48 2011 +0000

    Merged trunk

commit d37e9d2378476ba7b7c5eb38d207fdcda17a80a3
Merge: bbd5a91 54876f7
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Aug 3 11:38:01 2011 -0500

    Merged trunk.

commit dd5ba115df36df221e0bbbdc0bebb8d8761374eb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Aug 3 15:50:29 2011 +0000

    Default dns to '' if not present

commit 1752f677c13d6e36a7431ef0970e5f3db6b4d7f0
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Wed Aug 3 10:44:09 2011 -0500

    replaced raise Exception with self.fail()

commit 4a3adb5be7eb1600fb5298aeac344a72c69d48d1
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.

commit a7c1f68c685b34940cb95259655988db3fe50162
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Aug 3 10:03:15 2011 -0400

    PEP8 issue

commit 2bdde85e8984f4dfd1d1e3480afddc1e8592e252
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Aug 3 08:57:27 2011 -0500

    whoops, got a little comma crazy

commit e03f4ed8b14c88ac9d39ce0552a335e53c4560db
Merge: 82d1db2 54876f7
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 37a84832d3300ff893606b148c1b6255d070acc7
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Aug 3 08:54:00 2011 -0500

    fumigate non-pep8 code

commit ac4353d59983f05997a5361646ed24aacff56314
Merge: 3d8c168 54876f7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Aug 3 11:32:27 2011 +0000

    Merge with trunk

commit 3d8c168a548e7c42eba6cbe4c91f5da18d922eea
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

commit 4e35ad74d58d2672a0a5ae965786abac2407c3d5
Merge: 3f932c1 54876f7
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Aug 3 12:39:27 2011 +0400

    Yet another conflict resolved.

commit 971481e61257be73e0ab8da0409087afc7fcbfe4
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Aug 3 00:16:52 2011 -0700

    forgot to remove comment

commit 040f01a207e50d6ed1b3d9443574dfe00d6a8ad9
Author: John Tran <jtran@attinteractive.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.

commit 5409ab7524c595c1323ad31333c663b7c25a2530
Merge: a91fe1c 54876f7
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Aug 2 23:16:27 2011 -0700

    merged from trunk

commit da7da4ff256820683d14f7d59a15d125affbdf0c
Merge: 80bc962 54876f7
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Aug 2 23:07:23 2011 -0700

    merged from trunk

commit 2c5a3315a241987c4a08b4cef283b268353a4b79
Merge: 385f448 54876f7
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 2 23:02:07 2011 -0700

    merge trunk

commit f53b13134e43ac9e4c9a1d68b49af9fd84d3f19c
Author: Launchpad Translations on behalf of nova-core <>
Date:   Wed Aug 3 04:44:31 2011 +0000

    Launchpad automatic translations update.

commit 05aa9e322023d7e5f9011d8e7c4c3155623dce53
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 22:25:23 2011 -0500

    Resolved pep8 errors

commit 8552357e80b8b8a0c8283d00a1a625e7aa6950cb
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 22:22:34 2011 -0500

    renaming test_skip_unless_env_foo_exists()

commit 3ef85e6830e3144274a1d7d1f25488f8c916ccb0
Merge: 055cae3 54876f7
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue Aug 2 21:16:45 2011 -0500

    merging trunk

commit 279d3d869ea58ffabbdd205178a2a4723d205333
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 01:32:08 2011 +0000

    Removed trailing whitespace that somehow made it into trunk.

commit 9d95dcf130d2ec938d959625081b86efc9185b5b
Merge: 6ad187b 54876f7
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 00:52:33 2011 +0000

    Merged trunk

commit 6ad187b6f66f830cc3f8202e8d1ed848df21d00b
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Aug 3 00:52:15 2011 +0000

    Removed duplicate methods created by previous merge.

commit 58160a4502a8b0635557c62dfc0564c9a92de7a3
Merge: 94d52ff 54876f7
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Aug 2 20:11:44 2011 -0400

    Merge from trunk.

commit 4bbc1e931199b336acc909bf7500214453613bed
Merge: 8cfb664 54876f7
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Aug 2 19:49:31 2011 -0400

    Merge from trunk.

commit 54876f7d4b7a960d030dd95ebafdbf5695388ebb
Merge: 84f4e0a cad75f7
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 84f4e0af6669504d1e39952bb418217a40ec1a9f
Merge: fc19f2f 7d450c3
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 fc19f2f913278fa2927e4bd12770054beb5562df
Merge: 177010a 1f7de87
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 c1bc605bb7e46f18eafca614bf5167fbe79d4358
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.

commit cad75f7d7337f42127c8b5c66a09fb831c51c83c
Merge: bfad7ef 177010a
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 17:30:01 2011 -0500

    Merge from trunk

commit bfad7efed03090fabacacf78261fe2e2df9f78de
Merge: 640e54d bc0189c
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 17:29:34 2011 -0500

    Another unittest

commit bbd5a9129df9d4f01d5f1c67ad8e0a2685d8eaae
Merge: dc593b8 177010a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 17:24:12 2011 -0500

    Merged trunk.

commit 177010adec673fa665cf66bdf0603d6abee88ba7
Merge: 24bf3ac 3dbce07
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 dc593b84ee2d2dba394fed42901c4ecbb341ee94
Merge: de00964 24bf3ac
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 16:54:41 2011 -0500

    Merged trunk.

commit 24bf3ac2daf15a89f0d4803c7472267d55af588f
Merge: 9cc8949 9787df9
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 864cf4e910988371073c84a15ab28bafdc56b35e
Merge: 1d482a7 f753b7a
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 21:23:35 2011 +0000

    Added changes from mini server

commit c92dc38630caf226c2066655728e112766c218d7
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:11:53 2011 -0400

    raise correct error

commit f753b7a418960a0f8a285e9a6da556eddb2dd6cc
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 21:11:12 2011 +0000

    Minor test fixes

commit b942fb540278a59b09363376b2fce19fe83ffb22
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:05:21 2011 -0400

    fix failing tests

commit 63bb72f114085bd2dd8a9c33d1ac201736b4f0fe
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 17:05:10 2011 -0400

    fix pep8 complaints

commit 3dbce074179d92a9e0ede60b62c915e8f8eab68a
Merge: 705a7c1 9cc8949
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 16:50:16 2011 -0400

    merge from trunk

commit e018f6d6816f26e636d0aa91d9da2506529d9af2
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 20:39:14 2011 +0000

    Fixed a missing space.

commit bc0189cf819e249147c029cd6fddf01383f18cb5
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Tue Aug 2 20:23:12 2011 +0000

    Bad merge res

commit 7d450c34cd3681291047963d536e01dfd2e0e989
Merge: 161e622 9cc8949
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Aug 2 15:13:33 2011 -0500

    merge the trunk

commit aa5a809aa011603deb1ef80edfa9cfd23bab25ea
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 16:08:17 2011 -0400

    fix missing method call and add failing test

commit dd8ea76463923a2ba133493789ad7f4cfefbec4d
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 files changed, 0 insertions(+), 1 deletions(-)

commit 82d1db22c0a73b1e69e7347cf2025b8f31a18a56
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 2 15:43:36 2011 -0400

    Fixed merge issues

commit de009644c17f7e74ee79e3c19fbd7e1b5bf21d99
Merge: f3bc677 9cc8949
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 14:39:41 2011 -0500

    Merged trunk.

commit fc3c1e504644730179c497a47461df95e95eed70
Merge: 649fbf1 9cc8949
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Aug 2 15:39:14 2011 -0400

    merged trunk

commit 640e54d330f6c6d6dae0b8a0c35d0ec834e8731b
Merge: 5de1c87 9cc8949
Author: matt.dietz@rackspace.com <>
Date:   Tue Aug 2 14:37:54 2011 -0500

    Merge from trunk

commit 3329d742ef7c730c7f9ab613ce0558781798347f
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:30:27 2011 -0400

    remove unused parameter

commit de44f29864b6b973441607dcb90a71fe47d028d3
Merge: 4685996 9cc8949
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:30:03 2011 +0000

    Merged trunk

commit 46859969c2ff720cfba0c164405cfc1a2c7babaf
Merge: 8bdf4d9 1d482a7
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:29:40 2011 +0000

    Merged from lab

commit aab1a052c9ea74713f989ed7db1d868c1f7d5242
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:19:00 2011 -0400

    fix pylint errors

commit 08086cc85b344540b3fc01aa8a9eae341094c464
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Tue Aug 2 15:10:09 2011 -0400

    fix pylint errors

commit 705a7c16d13138269178d3921ca3faf6de0cd0ed
Merge: e4e2252 473820c
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 15:04:24 2011 -0400

    merge from trunk

commit 9cc8949fbff7701a5eb677f07352cd77ecd07fbf
Merge: 473820c 976285f
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 1d482a7ee835b8bd517b3234064a80b024d4d2aa
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 19:02:40 2011 +0000

    Fixed several typos

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5de1c8742b37b6354a8dba4dd273de60a6e8fd00
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

commit 473820c194d5098b897fd32a3683d74872345af0
Merge: 28b1bdb 6792c07
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 9787df90419fa0387e5f0415a4ea1856210c40de
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 18:36:12 2011 +0000

    Fix an error in fetch_image()

commit f3bc67732031f9a7eb860b9cf3b2c8b2b5de8839
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Aug 2 13:34:29 2011 -0500

    Get instance by UUID instead of id.

commit 3f870217d9a458ae3af52218314d5ef4c414b242
Merge: 5ff2e44 28b1bdb
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 18:24:09 2011 +0000

    Merged trunk

commit 5ff2e443e526613ae3f673d0aac6ba9febad2851
Merge: df8c3a4 480eec4
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 18:23:58 2011 +0000

    Added the powerstate changes to the plugin.

commit 62ad6d660f8e524c532d8497d92e61ff3e3f25af
Merge: 74a2cf2 28b1bdb
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 976285f18034df9efdb1d7a3e3156b1fb5330d17
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 13:32:14 2011 -0400

    fixing typo

commit 80bc96226368e330ddd6491c876d8b74708bb9de
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Aug 2 10:06:22 2011 -0700

    refactored tests

commit 74a2cf20487e67d21a133af4eb5f2ca1169bac85
Merge: b7b1c17 0e0ec40
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Aug 2 16:30:41 2011 +0000

    pull-up from trunk

commit 28b1bdbe23d274877424bc73950077c0d3b9d5bc
Merge: 0e0ec40 ac8187d
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 94d52ffab250889a48bd3f714e92f6103c146fef
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 11:48:01 2011 -0400

    cleanup

commit 8bdf4d9929abf11e63c23f329225bb07a0dc7877
Merge: 9a2f7c4 0e0ec40
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 15:36:05 2011 +0000

    Merged trunk

commit d441bbbd4a988ffacb193be9ac2191b1342fc6e0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:24:23 2011 -0400

    abstraction of xml deserialization

commit bb6fcf01a6a37937a9b0df06c374e66b39a748b1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:21:36 2011 -0400

    fixing method naming problem

commit 6792c070a8b73dea524cafb902be0c9fc492dc4b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Aug 2 10:09:58 2011 -0400

    removing compute monitor

 setup.py              |    1 -
 tools/eventlet-patch  |   24 ------------------------
 tools/install_venv.py |    9 ---------
 tools/pip-requires    |    2 +-
 4 files changed, 1 insertions(+), 35 deletions(-)

commit e4e2252ec976c68c2130b39197f4708bb3ca356c
Merge: 19e47f0 0e0ec40
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Aug 2 10:01:17 2011 -0400

    merge from trunk

commit 0e0ec40ba05c8eee9e80fd0d07d5154300bf68af
Merge: f8563e1 cbbe1f7
Author: John Tran <jtran@attinteractive.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 f8563e18ae9ae272a7f3d6f0a2a2bc0dd89610b5
Merge: bdae37a cc229c7
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 bdae37a0cfe8688a6af9b601c351199ed1e4b82c
Merge: 1500cf7 a36df6f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Aug 2 11:17:42 2011 +0000

    Better error handling for resizing.

commit 1500cf738f47321bcbdf9e851343c71e1c7136dc
Merge: f39f264 2ade777
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 d452048ef6e33336d63ea10589f34292e5bb94d4
Merge: b291204 f39f264
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Aug 2 18:43:30 2011 +0900

    merged trunk rev1348

commit b84eab2a76d38f61073de0f344d7d47a33c03804
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Aug 2 04:52:00 2011 +0000

    Launchpad automatic translations update.

commit a47647c6708535b76242c11eb60fb56f1960eb9b
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 1 21:34:43 2011 -0700

    added some tests for network create & moved the ipv6 logic back into the function

commit 3cb3db20360e3846551f3134f714ee8b6fcbe61d
Merge: edb751f f39f264
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Aug 2 11:36:58 2011 +0900

    merged with nova trunk

commit 480eec4765b316757afbc1d8400915a585dc605c
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Aug 2 02:19:31 2011 +0000

    Added host shutdown/reboot conditioning.

commit 1f7de875702c00dcb434d0dae4a369db40c15af3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Aug 1 18:56:16 2011 -0700

    avoid explicit type checking, per brian waldon's comment

commit 055cae3b1455bcd57cf6aae9f1f1c4bb1d4eb33e
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.

commit 385f448c6ae159a9b20374a805a7a696a201fe73
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 18:30:59 2011 -0700

    fix LinuxBridgeInterfaceDriver

commit 95b90c494f1eaa9d301d5ea15ab21e2332da4bc8
Merge: 6de7dfd f39f264
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 6de7dfd6d4ae93ab36f5d19cccb0db480df52060
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 18:11:15 2011 -0700

    initial commit of vif-plugging for network-service interfaces

commit 9a2f7c4cf112bed149c9abfa450c414ed141b8b3
Merge: 40e3036 f39f264
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 1 23:38:26 2011 +0000

    Merged trunk

commit 6f5f171aa35d490193ce15a9bbb6a8eacc4dcf7c
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 1 16:27:17 2011 -0700

    pep8 fixes

commit a36df6f1e55570c01fbc6c3edf301abe2367e951
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 1 18:01:04 2011 -0400

    Controller -> self

commit df8c3a428276d24f5ecfdec7fec0d362ca222983
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Aug 1 21:06:47 2011 +0000

    Added option for rebooting or shutting down a host.

commit 8cfb664716c102eff67554658f0eab8122594163
Merge: 6ef3bd8 f39f264
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Aug 1 16:42:01 2011 -0400

    Merge from trunk.

commit 512afb6b727b0d8ec16c034582908af2e2f5118b
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 1 12:47:41 2011 -0700

    removed redundant logic

commit f9d712287c8d77fc4a29fc63fa3a8f45505f8276
Merge: 85f6009 f39f264
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Aug 1 12:39:26 2011 -0700

    merged from trunk

commit 85f600946e9b7332faaedb85df5a58da46cd1aa0
Author: John Tran <jtran@attinteractive.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.
    "

commit 2ade777ee2e0c3e3ad04a9c407252308dbae1c56
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Aug 1 19:05:32 2011 +0000

    Carry auth_token in nova's RequestContext

commit 197997b07daf1f1bb5e6da2074ab594fac5e141a
Merge: b20445b f39f264
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 1 14:59:49 2011 -0400

    merge with trunk, resolve conflicts

commit b7b1c17eb2652bc996ad21813e4263c4b43c47f1
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

commit 161e622876012d2fe1414ffeb900b096453644b9
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

commit 19e47f02260d16814d7a574421e5e4f2a928e23f
Merge: eb1bcb0 f39f264
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Aug 1 14:20:10 2011 -0400

    merge from trunk

commit cb5cebbf5de194f8f57500d4c0acf9234130d1a6
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 a34f223e073133cfa38d2b34209ae41696585e10
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Aug 1 13:38:14 2011 -0400

    Update compute tests to use new exceptions.

commit a996ae52fce16bdc140a8201900db8a19c8dc34d
Merge: eddf5cd f39f264
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Aug 1 09:58:06 2011 +0100

    Resync to trunk

commit eddf5cd24e94f9d5b8ec11fb9a16415b082e0131
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Aug 1 09:30:13 2011 +0100

    Remove copy/paste error.

commit 648604a4be86adf0293c01a3295422b87c4d30df
Author: Launchpad Translations on behalf of nova-core <>
Date:   Mon Aug 1 04:58:49 2011 +0000

    Launchpad automatic translations update.

commit 94892ad9c6f2e0dd89a128626948f82af9ceb195
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sun Jul 31 04:51:55 2011 +0000

    Launchpad automatic translations update.

commit 1f4ba73797408c4a856fa7b0abd0a10da4a1e6dc
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.

commit ac8187d12bc11aed6404849acfddb01d9d54ac4c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 18:29:23 2011 -0400

    pep8

commit 3edae35cbeb1991b155d5af7eb5ea4531b29a71a
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?

commit a77912c842a2f59f8b902662add8de637668c317
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

commit 5502f5938bbc1ec1d0a42e3cc5d2868600038f42
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 22:19:16 2011 +0000

    Make unit tests pass

commit 773cd131e6f00179c6f2be880edb6c2e581405bd
Merge: e3815ac f39f264
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 18:17:08 2011 -0400

    merging

commit bc9eacc1f44efbce427d058b785ebcb3d0d9e9cd
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

commit d3fdf0013a92af5a3f25ddc9113753c9bbd074d8
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.

commit b01fa3138de4dcc51860429f0a4f1aed662718a2
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.

commit 86d9f4bf0e031410b085efe015e42fcd5f5d5004
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

commit 5b0c8a51cde168e6b93d902ba4f61843cbf6809e
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

commit fad3aeeae784e06b7c8c028f97c535056807a234
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

commit 43161ab4338bc9d28d75eb869db39c654e258c1f
Merge: 71b7c89 f39f264
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Jul 29 14:36:30 2011 -0700

    Merged with trunk

commit 514ef645dfbf4e505dcf2084319ddba6ef5ec8a9
Merge: 125a034 f39f264
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 17:33:55 2011 -0400

    Merged trunk.

commit ceb4089421ccef8d61ef707902883d8a83fed986
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

commit bb384cad65e1d18e6bed5a5883e8a2600751dcd1
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:16:05 2011 -0500

    allow getting by the cidr_v6

commit 8e8152e2815d8b2bfb5cdbed616f2f3e3f2d2d72
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

commit 1020a1ef449bb266bd4916373a5c2b400c333630
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 16:09:57 2011 -0500

    either v4 or v6 is required

commit 3e5e8e72d3f5dff929b3feba851180a086df66a3
Merge: 5e15eaf f39f264
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 16:51:23 2011 -0400

    merging trunk

commit e45e02909b215e591f824a77e8f6995129d53f0f
Merge: 32fc5d2 f39f264
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 8e064768a40028184a3f25691a88b63b3b724924
Merge: 9adeddd f39f264
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 15:06:33 2011 -0500

    merge trunk

commit 9adeddd7fa4eb5107f7a9d5827ad8b5fbe1970eb
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 15:05:53 2011 -0500

    stwart the switch to just fixed_range

commit 90fb46c7b1dcd8c085212dc71eb2f6e4549af284
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:58:41 2011 -0400

    typo

 HACKING |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit f39f26460c3a76c5f4c1b1787b1ccf82a58f0118
Merge: 10ec1e7 9ae0f89
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 a19acb0ad5a85b788b7324120c334da29d616833
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 14:53:38 2011 -0500

    require either v4 or v6

commit 32fc5d2ccec8557a44ab9da20faccf53a90a48a6
Merge: 60110a5 10ec1e7
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 29 19:52:11 2011 +0000

    pull-up from trunk

commit 10ec1e735969b7fd7abeebc7f0cce349a5c2584f
Merge: 971079d 2f496ea
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Fri Jul 29 19:48:58 2011 +0000

    Fix various errors discovered by pylint and pyflakes.

commit a63485a5c094e6680080b5fe50c5c3f549605494
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:43:23 2011 -0400

    fixing underline

 HACKING |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 49d3e6591a2f1c64c10e2f14fd93bd8601cc3fda
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:42:10 2011 -0400

    removing extra verbage

 HACKING |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 9ae0f89968daab5c9d469037cc0961a09d887f10
Merge: 2677b41 971079d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 29 19:36:37 2011 +0000

    merged trunk

commit 971079d4b58162e812812ba86456d60ccfe5cb72
Merge: e3e5df2 7e5656d
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 48badc808ae31143fee3ef53de81e1e0a3a85322
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 15:32:27 2011 -0400

    removing dict() comment

 HACKING |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit 8b9d1d0300084635057966c14ba22ce4c569a0fc
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 files changed, 1 insertions(+), 0 deletions(-)

commit e3e5df2020f17056389bf4621c06a0baacc18a68
Merge: db79c0e 125a034
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 7e5656dd6e185df841ebd022425a2a03b4cbbf27
Merge: 28ce602 db79c0e
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 12:16:53 2011 -0700

    Merge from trunk.

commit cc229c7b0890d874e9333086f78c00591543b693
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 29 12:09:17 2011 -0700

    made the whole instance handling thing optional

commit 28ce60253a8764b3641e6785ce601455d9df3e63
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 12:08:59 2011 -0700

    Reorganize the code to satisfy review comments.

commit 60110a58ddf714847648b0197fb8b73dff3335e2
Merge: b054b00 db79c0e
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 2f496ea6b4acf0ba22b8bfdd63b71e74bbd23170
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Fri Jul 29 14:58:49 2011 -0400

    remove unused import

commit db79c0e6f1057d8480f794c3b77f834b568da17c
Merge: 2705d9f 06521be
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 69bcf46713f2e4ec9467b1d63c8190ccdf023998
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:51:49 2011 -0400

    removing 'Defining Methods' paragraph

 HACKING |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

commit 4913f51f56d4062ed8ad6414298acd36bc182abb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:46:24 2011 -0400

    rewording

 HACKING |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

commit 00c25f1541e02faba18215ba8c049f8280eaa0a7
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Fri Jul 29 10:33:58 2011 -0700

    Use the util.import_object to import a module.

commit 89429fc556def99a4652564b42c8da424969b59b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 13:00:09 2011 -0400

    rewording

 HACKING |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d692a9093422dcdf4fd060c560a7e8bdd94cddf0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:54:55 2011 -0400

    one last change

 HACKING |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 740d273cf80a479b005953f280104c0089392d89
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:49:48 2011 -0400

    upgrades

 HACKING |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

commit f9ccecca6fe881fb9ec522942f5791c3252bba47
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:44:11 2011 -0400

    expanding

 HACKING |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 deletions(-)

commit 2677b41972f4346ccb4734a0d7a0853723f8bb5b
Merge: 001d968 2705d9f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 29 09:28:02 2011 -0700

    merged trunk and fix time call

commit de6cb20d4252de93fa8ed9eec49bc4c4b12365ed
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 12:21:46 2011 -0400

    updating HACKING

 HACKING |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 6 deletions(-)

commit 6ef3bd878f257c6db219d83b45a63a376c87d562
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 12:14:29 2011 -0400

    Fixing lxml version requirement.

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 125a0343fa397d932a380539b42e2e57e6504818
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.

commit 5e15eafe53341a2e7a43f2dd6034f4d5ec1117e1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 29 11:35:50 2011 -0400

    bumping novaclient version

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 8ad39750c426524e38406bb9ffb2be034cb6d971
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Jul 29 11:07:07 2011 -0400

    Fixes lp:818050

commit b7bfae7cd03bd4ee455cdbf3d7113821d3407707
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.

commit eb1bcb0fa66cd655a40f8e89700d1135eecca4ee
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 29 10:54:20 2011 -0400

    fix run_tests.sh

 run_tests.sh |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

commit 06521bed89e09a4a8a3268e312efe02f4172e525
Merge: 49b2b53 2705d9f
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 29 09:37:11 2011 -0500

    merge trunk

commit 649fbf1cbf3d3516758e21aa82f02aa7656fe56a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 29 10:22:50 2011 -0400

    Fixed changes missed in merge

commit 67b0e0e0a3a56b3048b4b8bcfd22c826fbd9b9bc
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

 run_tests.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 115049f536542c66bf94e2073899f1d280ce49bb
Merge: a11257f 2705d9f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 29 10:07:38 2011 -0400

    merged trunk

commit c7e8f86ac63f6929fc452cf9ab182180327d8768
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 29 07:05:27 2011 -0700

    added instance support to to_primitive and tests

commit b291204a0f7edb4ea6703bbaabb0356a9ed21134
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

commit 47d945306c4b258548d260527e3b5598a9451496
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 03:42:40 2011 -0400

    Removing unnecessary imports.

commit a90992a8d20af380f5a0b1967c547b8cbd99a261
Merge: 8605276 2705d9f
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 eb0cb67c65551ac6b0730684d28e9277476676f9
Merge: 8a1d30b 2705d9f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 29 01:58:12 2011 -0400

    Merge from trunk.

commit 8a1d30b657bd613df4edb2304ceba0587466203f
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.

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 001d968bea293287f1af0aa56e4424803c6c935f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 19:06:48 2011 -0700

    remove extra log statement

commit edb751f14ba9b36375320ce432dda199a826ef43
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.

commit a259d0a182d9e1931cda6820ec7b94539b08f405
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 21:00:55 2011 -0400

    fixed typo

commit 9791b9fb43f75c89701d33d4cc65e92b9d7cc596
Merge: 8ea2815 2705d9f
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 21:00:17 2011 -0400

    merge with trunk

commit 8ea281536de5722ed09e2ba57f6ecf8fda83bfc3
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 20:59:07 2011 -0400

    fixed pep8 issues and removed unnecessary factory function

commit b8051939d2cb024d2827f576f70008d845cb6423
Merge: 344ce4b 2705d9f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 28 15:54:27 2011 -0700

    Merge trunk

commit 56788f5900f7289db13308e24096f810aa6aa9e6
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 15:54:02 2011 -0700

    returned vsa_manager, nova-manage arg and print changes

commit 5c664858425f8b1d63e29d09df68e196f32cf276
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.

commit 2705d9fc8c30719db569a78b2a4eda05374b0bbb
Merge: c560e89 223eaac
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 c6f4b045f56adefa80e54a288ecbeb6c22ef5408
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.

commit cced7adbd713038f041f24c50bd76092b6f5ffef
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 17:41:13 2011 -0400

    fix pep8 errors

commit 223eaac66fd72d2c20964d615a89840fbd78f4fc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 17:21:06 2011 -0400

    minor cleanup

commit c560e89eac5df7f93656b59011f366da026ada9a
Merge: 6d60ea3 2061257
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 21:08:47 2011 +0000

    Removed unused Duplicate catch.

commit b054b0029feff1a783b3e29683b26be0aa55df40
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

commit 6d60ea30d561bc669a9ab8467d1d4cfcaa7acf65
Merge: e41bd92 b69596e
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 7b107c752b9bb9ac41fc28eecc4e82bce3575a7d
Merge: 2086fcd e41bd92
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 16:35:56 2011 -0400

    merging trunk

commit 2086fcdcfe54f4fbd723036ea0f500e3eb4b1d9b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 28 16:33:14 2011 -0400

    pep8

commit 18097d748c6bf1b162c93f8c371835520260eecf
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

commit 3e35c127d129da0a46e8f6cf11da3ee43b638873
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Thu Jul 28 21:12:03 2011 +0100

    Simplified test cases

commit 3b1812d7843cb2445c07a7a954e41a8feeee4775
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:50:09 2011 -0400

    Rewrite ImageType enumeration to be more pythonic

commit 79c668f45467878e201d37d15dee031ed01570a7
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 15:48:30 2011 -0400

    refactoring and make self links correct (not hard coded)

commit 7d065225e019df0b5d2394e9d94e994e486c9261
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:46:20 2011 -0400

    Fix tests for checking pylint errors.

commit 24e2c69513a143fac38665dec277ba54efef1a0d
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:11:54 2011 -0400

    Use utils.utcnow. Use True instead of literal 1

commit 98f5d356baaaa249b4dd1f4a146640d8cb64da15
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Thu Jul 28 15:09:02 2011 -0400

    Some tests for resolved pylint errors.

commit 12350f8c484ed30ca5eac8cf047b5d3be692e726
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 12:04:49 2011 -0700

    simplify if statement

commit 49b2b532c48a8942cd4b302a475d9ee9e1b492e7
Merge: cbf23ec e41bd92
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 14:01:30 2011 -0500

    merge trunk

commit 07a7f34709214bb1e9ad48716ae085386258bcc3
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 14:59:28 2011 -0400

    use wsgi XMLNS/ATOM vars

commit e41bd925674125be1bb941f40e5b080f47535b39
Merge: 3aaacf0 86d582a
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 20612571b0a19e4ebf5ab5d962762bed1cc52001
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 13:50:06 2011 -0500

    Removed unused Duplicate catch.

commit b998d6f87246694e2265a265477d02c6ed88de4d
Merge: 4482b34 3aaacf0
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 28 18:47:56 2011 +0000

    pull-up from trunk

commit 3aaacf0cb0d58c11db0e938417bbbef5b64ac9a2
Merge: e2c283b eb14677
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 18:38:39 2011 +0000

    Catch DBError for duplicate projects.

commit eb14677a7ff51f1ed4d4c3d040b8579eff7450f6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jul 28 12:52:47 2011 -0500

    Catch DBError for duplicate projects.

commit e2c283bb6f0d3e735008c8c7d1c32265d45723f6
Merge: e457875 c8999dd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jul 28 17:18:59 2011 +0000

    Make network_info truly optional

commit cbf23ec784cce800ea75ddc39c13434216f184f1
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 11:01:38 2011 -0500

    trunk infected with non-pep8 code

commit ea05857188fb915732bfc97b983ac64172cd4f44
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 28 08:44:01 2011 -0700

    unicode instead of str()

commit e4578754a428fad4222b7fe3a64b49775a0509c0
Merge: 0591a60 535310a
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 7f317e6cededb6f272d332c096cdbcdcb425e607
Merge: 12c1636 0591a60
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 28 10:43:06 2011 -0500

    merge trunk

commit befd60a8c492eec464bc1282688bf12111b2cc2c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 28 08:34:27 2011 -0700

    make payload json serializable

commit a11257f4e13018ab1f81bf6fcdf61b810b9b1750
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 10:31:06 2011 -0400

    moved test

commit 6ed02a22792f1352953162c72e90373739df62bb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 28 10:23:44 2011 -0400

    Removed v1_1 from individual tests

commit a6968a8f15b3a45b4ed518a5ce6c176e8f4b713c
Merge: f0ce34a 0591a60
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 28 09:08:18 2011 -0400

    merge from trunk

commit 45ecaf954e2309e566dbff09c223b9a781e30d91
Merge: d226f05 0591a60
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Thu Jul 28 14:06:11 2011 +0100

    merge to trunk

commit 4a36ccc0cd3b5bf4808a14208a66af5dafc091ec
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:45:16 2011 -0700

    more commented code removed

commit 417bbed372cccc937f925d0474cfdbdbeadc6ca0
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:27:16 2011 -0700

    some minor cosmetic work. addressed some dead code section

commit bbbcbe54bf8400b65ac3bb4b3b1ef369feaece5f
Merge: c39476b 0591a60
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Thu Jul 28 00:01:21 2011 -0700

    merged with nova-1336

commit c39476ba628686893cb7ea4f1e8b993be22e2ac9
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Wed Jul 27 22:49:16 2011 -0700

    prior to nova-1336 merge

commit 6746decca3311695bfb1083b7d70ee24b821bc07
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

commit 38fc635c54a458cffe69412ba41cbb215879de9c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 01:31:09 2011 +0000

    fix tests broken in the merge

commit 1a38897f25dc75cb48ffe548d4405212f226f8de
Merge: 48185f6 0591a60
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 28 01:17:21 2011 +0000

    merged trunk

commit 53190f76a7631ab74dd92f0740de2a54d1c37d65
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 21:11:22 2011 -0400

    fix undeclared name error

commit 8a11e25d51235a90f4e69a273c2bbab8a2f40fb0
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:56:12 2011 -0400

    fix undeclared name error

commit 60cb23a616c4536b1d39d1af156bc007de371f50
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:55:10 2011 -0400

    fix undeclared name error

commit 579e663c9abfa6d974419732da9dd47d0922fb3d
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:49:51 2011 -0400

    fix undeclared name errors

commit f263f352d7f6fe3c38576d7d5a7909599f579b44
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:48:26 2011 -0400

    remove unused assignment which causes undeclared name error

commit 95aa8f210777f28689e7e1118e6e0e9af472bc5e
Author: Matthew Hooker <matt@cloudscaling.com>
Date:   Wed Jul 27 20:45:04 2011 -0400

    fix undefined variable errors

commit 07f0900b7730b7de68eb66fb5f2535c700382dd3
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c8999dd0d41dc4c02b5fdc3489f702d4000fd71e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 27 23:32:39 2011 +0000

    Make network_info truly optional

commit 0591a60c7242ccb4f7366f15bfcbe501038766ec
Merge: ba2a06f feafac6
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 feafac64951fa205008a9e5b8d8bfef364de4cdf
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 18:00:45 2011 -0500

    forgot a line

commit 04d7a9ba05cbf860eefebbaea3109e77ede67d87
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 17:58:13 2011 -0500

    fixed create_networks ipv6 management

commit ba2a06f9a2ccec6d7236652f4aa93075f46f8c2e
Merge: 24efc51 a8a4f0e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 22:28:58 2011 +0000

    Fail silently.

commit eb6be3b1d83ad727f177bc969c98aa9d537c37a4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 17:24:39 2011 -0500

    typo

commit 53a6cb69737405d2b87624a9545055bd8a376bd6
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

commit 71b7c89f16d7d2ee47ee1c89d3f6c410bde157f8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 27 15:14:13 2011 -0700

    Reverting to original code

commit f0ce34a551419ecc28ad2a1e225c71853735e227
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 18:07:01 2011 -0400

    use ATOM_XMLNS everywhere

commit 12c163649804778d4ff6df389ce08677ecbc7b10
Merge: bc0aab3 24efc51
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 17:02:49 2011 -0500

    merge trunk

commit 0028f99504ace46947405dcde39f038fe4dc8286
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 27 15:02:00 2011 -0700

    added unit testcase to increase code coverage

commit 45b54eb01d373ce881557a3185562e3d2e98e49f
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:59:05 2011 -0400

    stub out VERSIONS for the tests

commit eb77554f9eb09fab3c6cc04d4d851ab8ebb6e7a7
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 files changed, 1 insertions(+), 3 deletions(-)

commit a8a4f0e0e75c733df50ed28120292a33a07bff7e
Merge: f054375 24efc51
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 16:39:27 2011 -0500

    Fixed conflict

commit f0543752ebc787438d73df8b2f6ed5201c95a350
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 16:34:55 2011 -0500

    Fail silently.

commit af5824a07899c4551f63c2dd6bf3d05d7cd418cd
Merge: 2fc0b87 5e18169
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 24efc51e457d90de5957b02aecaccacc145fd71d
Merge: d2926d0 da0c9f2
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 84f41bdf5a6e6296c3d4dba46930bcb65d8d969c
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:21:14 2011 -0400

    pep8 issue

commit b20445b6a6cc58f9101f116f9661b64409a5a649
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 17:20:42 2011 -0400

    refactoring MetadataXMLDeserializer in wsgi/common

commit 2bae2a868bb0bc682eefc494244c4d2998581101
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

commit d2926d0c49d7db536e2e29d3249e5545b8353335
Merge: e0e0c1d d62af7a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 21:17:07 2011 +0000

    Fix all of the skipped libvirt tests.

commit bc0aab316eb638242d8c21c441b399ba45e82378
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 16:13:07 2011 -0500

    fix typo

commit a584f95e18a1d04c7ac72f08f7aebe56d32e14fe
Merge: c1451f0 e0e0c1d
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:09:57 2011 -0400

    merged trunk

commit e0e0c1d029a8ec65b17375907f1eceed433ffe31
Merge: 6704320 87b0374
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 21:09:18 2011 +0000

    Fixes typo in attach volume.

commit c1451f08d83cb5370affe4f1f72ad3455f247a78
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 17:09:17 2011 -0400

    utilize _create_link_nodes base class function

commit 55be6efffb22cda35b0a17dbc37f9c9998421eae
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

commit cdf12312d647d680b29876c19620634cb7b1103f
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 16:02:00 2011 -0500

    pass None in for nw_info

commit e6838b9fa3832e7f1d6501555e37f380c0961592
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

commit 67043206d42ac13179b034d3e1f1d7812efdf5c4
Merge: aeefcad 65e1650
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 20:43:53 2011 +0000

    Drop FK before dropping instance_id column.

commit c13084652959ba3a44d99b55496bf405818f3210
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 16:34:02 2011 -0400

    moved rest of build logic into builder

commit 7f8a67e4853211a33956ebf9ecf610abfa7eac61
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 15:22:51 2011 -0500

    Drop FK before dropping instance_id column.

commit 65e16500244ec2c1c642f4647aa67014d3f4c340
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 15:02:48 2011 -0500

    Removed FK import.

commit 80a3c1db5704287f6fed52a5f94d3ca2fb23ab59
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 14:54:36 2011 -0500

    Delete FK before dropping instance_id column.

commit 946c99a51fa2f1f6a81dca5384d24da25ac4de19
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

commit adfdb2a4e84cc3786cac8f4031c0cefb80005fe3
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 15:29:15 2011 -0400

    update everything to use global VERSIONS

commit 85980096fdad0ce166deec6fc6db38e88716d736
Merge: 615ea34 aeefcad
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 14:20:30 2011 -0500

    merged trunk

commit b69596e696aecbde9a65205530551ef739b9e43d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 15:15:48 2011 -0400

    change local variable name

commit 615ea34702fa0ad1f9a41b89533cdba02adfd47b
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

commit d5ecb474a08e167e3b1882f8488c930e7c5b3478
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

commit 51ba89683bc8e69da51e1fb677d4a09e3a5c40cb
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jul 27 13:36:16 2011 -0500

    remove unexpected parameter

commit 5a07a330be8908033da7e2a09f2e30ea39ed37aa
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 14:35:47 2011 -0400

    fixed xmlns issue

commit 76f3a4ebbcd038e1feadc7b4e86708a51c4dc610
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jul 27 13:34:45 2011 -0500

    updated the bridge arg requirements based on manager

commit d564c87d76fba8d1422324944409a85d470f6f82
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.

commit 28273064b67f51fb3e2182436a4d8f0e1d34be95
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

commit dca11072360490660a812ad35ee67cbec942019c
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:20:34 2011 -0700

    Removed superfluous parameter

commit 5a476c9c54b805eb75e6de73828ac1bd45dcc365
Merge: ef29704 3280b64
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:13:29 2011 -0700

    Merge from trunk and conflict resolution

commit 4482b34443af1f2de2b3f5192c2a62f4a72e7ecf
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

commit ef297044d572de8b50593e4f09fcab4a54f84b19
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 27 11:10:35 2011 -0700

    Fixed the virt driver base

commit 1c399a12a7a2c1b2391623b74b646dc01cedecf8
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)

commit aeefcad6651c564f7af0732c9d5c4b6620a5cec0
Merge: 3280b64 927563d
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 18:08:36 2011 +0000

    Remove xenapi_inject_image flag.

commit 535310a228df0c6803f355f4b3f55487d9ecdf43
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.

commit 4adbcba2bed7c0fd1fe4ed202490ff6a6c48c54a
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 13:59:53 2011 -0400

    fixed issue with factory for Versions Resource

commit a0345060ce8ba1c8e065acd8a4245a23bb02a50c
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

commit cbbe1f700429c18f4102806adbfdebe562051e00
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jul 27 10:34:58 2011 -0700

    improved the code per peer review

commit 87b3887209a00d150385fbbe62e77a58f93aad1d
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

commit 87b037471d3f28ff62d918ae8dd2a1b9a60adbe1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 10:08:26 2011 -0700

    fix hidden breakage in test

commit 927563df1efc3d0adc89904eb5777613a8999527
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jul 27 12:07:52 2011 -0500

    Remove xenapi_inject_image flag.

commit c331229f64dd3376497bf62b62266017883ca9b0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 12:54:12 2011 -0400

    removed unused import

commit d62af7a4f30b4e4a2114cfd8a63b6cb9af1c70e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 09:52:28 2011 -0700

    pep8

commit d2310120f7ce5da7668398c06259ce3661c5a8f5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:50:52 2011 -0400

    pep8

 run_tests.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 9f69fe931068efce6d67eaf06ba2a72fc6a0cbef
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

commit ad098c23b1f0e88d682203d107b3ffd29e83e24a
Merge: fc6e2ea 5852e7d
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 fc6e2ea5918417818ac7d639fc2d8efbec754f29
Merge: 749e1b4 7673b2c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 16:33:36 2011 +0000

    Fix for boto2.

commit 3280b64d71e08bc52edc2321ff90a72a6630726d
Merge: c62082b 5852e7d
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 b576eefa81b06abc06000da6a138cdb166979da0
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

commit 3109fabf1fffcf7ea329ad9e7af071ebb9d8e55d
Merge: ee5a1b4 c62082b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:06:59 2011 -0400

    merge from trunk

commit ee5a1b4dbccd42419c649cb800550dcbc89fcc90
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 12:06:12 2011 -0400

    pep8

commit e5eb9460c09172fab9fce6319767b80dab8e00cc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:53:09 2011 -0400

    pep8

commit 5d06cb5e729fe403004329df5a4a89c1d4977e24
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:45:22 2011 -0400

    updating common metadata xml serializer tests

commit 5236202a8ad3c2295108b41b7337e50ca0c2f5bd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 27 11:43:20 2011 -0400

    Cleaned up test_servers

commit 09fb35982d87656c87d37afbed0d4e711855d6c1
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

commit 2915b48878565934278a4f787c85f134c3585938
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 11:32:18 2011 -0400

    updating servers metadata resource

commit 011b90af631b5a891633b4ab21b2afafd40a758d
Merge: d9579d9 c62082b
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed Jul 27 15:25:27 2011 +0000

    pull-up from trunk

commit d226f0538371e1e852cf8500501364c2b5ea8281
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jul 27 15:40:13 2011 +0100

    Address merge review concerns.

commit c62082b2e5ab2764a5391f774ac9aeee3e7625b9
Merge: 5e18169 7673b2c
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 c2e417cba54a061a5c47f674af3713e1e0b57e78
Merge: 8713414 d1efc8d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 09:40:19 2011 -0400

    merging parent branch servers-xml-serialization

commit 87134146aba0c4f74501e538a4e262c8063ea6d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 27 09:33:20 2011 -0400

    updating tests

commit 8e28d8fb27cbc68d2ba259734897968520222054
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:30:15 2011 -0400

    updated serializer tests for multi choice

commit 558450bda5c954e149d2c001a38c0142790b8de5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:13:48 2011 -0400

    pep8 cleanup

commit 73f6a68c18bd7cc2fe15737c56d81f6bd18bff5b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 27 09:11:41 2011 -0400

    multi choice XML responses with tests

commit 19452ff5685dde7caac05ce55763780ff4fc823e
Merge: c09033a 5e18169
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jul 27 21:46:44 2011 +0900

    merged recent trunk

commit 7ef3ccaad71b6913fb641173df65f7a8cf2feac3
Merge: b2d983d 5e18169
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jul 27 11:48:20 2011 +0100

    merge with trunk

commit 749e1b43c869ab7bf5a6f78210a1ef77ee81ea37
Merge: f5f587b 0dd71ac
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 3f932c1a0dcdd8cd3f41cc2a3ab4babde43a7790
Merge: 865b06a 5e18169
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 27 12:28:23 2011 +0400

    Resolved conflicts with trunk

commit c7502bd741a7375ac02e2043eab8e2fb94049a2a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:50:49 2011 -0700

    fix typo in attach_volume

commit 91fed953d0302004de4328cff9c261c173e9bfd9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:41:15 2011 -0700

    fix the last of them

commit 3ea20c75c75a478982466e72f2df223ea42b2681
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:33:53 2011 -0700

    fake plug for vif driver

commit ce333c50be4c1e62203b488c525528cc3273abb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:22:50 2011 -0700

    couple more fixes

commit 676c67a600adf419fb7ec7a95343a94f64a9ff61
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 23:13:03 2011 -0700

    cleanup network create

commit 4401021cf1e5fcb2361a74e6e7b403ca106e091e
Author: John Tran <jtran@attinteractive.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.

commit af5a4c6bb11e5efedbf298631b852a1d9a1e933e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 22:55:58 2011 -0700

    fix more tests

commit e05a5741ea27674a4a7e5dea50b79ef6a70f0fe2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 01:01:43 2011 +0000

    fix the first round of missing data

commit da0c9f2cf23c02a18b4a9ea7f106bc524d223a08
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 27 00:40:50 2011 +0000

    fix the skipped tests in vmwareapi xenapi and quota

commit 86052761da8342fcb5eff4721a312694f894fe90
Author: Zed Shaw <zedshaw@zedshaw.com>
Date:   Tue Jul 26 16:43:04 2011 -0700

    Add myself to authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2dc25995937a76ed84824c241f496cc658eeaf34
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.

commit a655f7d53fa19ce8338fb108a02fb3a09caa2ee3
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

commit 5852e7df1240c9fe1d7b0adf4d1745c6a2010e69
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 22:48:36 2011 +0000

    cloud tests all passing again

commit 0038de25cacdb4884258250926ec3740385b9464
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 18:16:28 2011 -0400

    added multi_choice test just to hit another resource

commit 25e49ecfc196cd8cc6c3f28881d00902dd5184fb
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 18:10:36 2011 -0400

    pep8 fixes

commit f06071928fb79ac32fe2bfcfead85ce2c9a9593d
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 17:51:46 2011 -0400

    initial working 300 multiple choice stuff

commit 0dd71acd409ffd408a03979fdaa5e4cb70bd716b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 21:29:24 2011 +0000

    cherry-pick tr3buchet's fix for milestone branch

commit bc325b13cdd580e3464f1b4d7434b87270fa2582
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 17:18:27 2011 -0400

    cleanup

commit 344ce4b6fd47e7cb440341e7029ebdf854798965
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 14:10:26 2011 -0700

    pep8

commit edd251f285998a99beb7e0580817d91ea9fc644f
Merge: 45f7222 5e18169
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 14:08:29 2011 -0700

    Merge trunk

commit ea0ebe99700a74c69e8efa355deec02528bfe1f4
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 17:00:10 2011 -0400

    pep8

commit d9579d96a1a150005296135d25ffa0f899496cbb
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...

commit 7673b2c2c451b2f80737b0f5b0999bd9f7951097
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 20:58:02 2011 +0000

    pep8 and simplify rule refresh logic

commit ad2828a458cdeef694796d4f10d897ebe8b868fa
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 16:55:02 2011 -0400

    pep8

commit b0deb2d3c170feed6957e545bf0f22d8c97e41d4
Merge: 3348831 86d582a
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 3348831ed40411cbc2e64d410150fd831bbf45f3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 16:53:00 2011 -0400

    adding xml deserialization for createImage action

commit a92114b432bbb2c7de7bb126b427c9f38264da36
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 26 20:49:46 2011 +0000

    remove some logging, remove extra if

commit 5e181696cfb009f505b8af4072cc942ceb9d6704
Merge: 6f045f2 4ed5cf3
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 da00c2c8275668f766c64d1086680ef1334b55c7
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

commit db962631941f17e8c0379b3623ebb9e388d7f9c2
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

commit 450a85f15227affa04e63d400abbfd39be301a9e
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Jul 26 13:28:23 2011 -0700

    pep8 compliance

commit 673ba338be27c8f13c7dd236507c0c7a270673aa
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Tue Jul 26 13:25:34 2011 -0700

    VSA volume creation/deletion changes

commit c069b5993df6e7666f21b9072d545ac9263eea08
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

commit a91fe1c685cb5510ef176da1324705e29e020b27
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Jul 26 13:12:34 2011 -0700

    fixed per peer review

commit 4ed5cf31cf6aac19761b27e38e27c5375884f3aa
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()

commit 86d582afd93931bb8485aa9d24287a59fd66e507
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 14:09:49 2011 -0400

    adding assert to check for progress attribute

commit 8a6b8c44c14f75e18b10aeb7b25d82304291d9b1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 14:06:02 2011 -0400

    removing extra function

commit 45f7222ccaff0b1b3e9891b48f22854262914679
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 26 11:04:53 2011 -0700

    Remove debugging code.

commit 84972ca6755c25ebade58815b2c6f058d55f2656
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:55:07 2011 -0400

    cleanup

commit d1efc8d059889edada71465f1d2c184c4434feae
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 13:49:04 2011 -0400

    fixed minor issues

commit c045f0b6dd6fa515af96a5836bf12c9d1304beb3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:47:37 2011 -0400

    reverting tests to use imageRef, flavorRef

commit b54df30cf8be767e8ebdcb7e329dda5c0b4a75e2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:28:11 2011 -0400

    updating imageRef and flavorRef parsing

commit 6f045f279a5252afb051603c5ed29ce673cd1999
Merge: 8dfe769 3c44dd6
Author: Dan Prince <dan.prince@rackspace.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 3c44dd6465e3229e33f22e58dda78434df8badb8
Merge: 8fe17ad 5226160
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 13:13:41 2011 -0400

    merging trunk; resolving conflicts

commit 8dfe76913871790638decf08c26395c963c33f25
Merge: 5226160 fb3bfc5
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 52261603f3ce6c9c5a9da9c094c8d46212dc8fa6
Merge: 47a988e 420a111
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 0e130629c9f7dde0fe716adc438e914668f4c3a4
Author: John Tran <jtran@attinteractive.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.

commit b3c9619cff1c81bf8c8f58571ebb4a45cdd40ea3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 12:57:06 2011 -0400

    xml deserialization works now

commit bb95a4eb3e5763f440aa012fb11fcd99ff89876e
Merge: 22821b7 47a988e
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Jul 26 09:49:51 2011 -0700

    merged from trunk

commit 48816eb0aaf0926b9ebabfc4a6c133450f096c4a
Merge: 6394453 47a988e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 12:42:55 2011 -0400

    merged trunk

commit 7d33ea316e8ff3a867961ebb9db8a0c8a2494247
Merge: 08b51b3 47a988e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 12:37:37 2011 -0400

    merging trunk

commit dc0a99d4e5585e62db6e29d00451e8e5b0a329ae
Merge: d2449b8 47a988e
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Tue Jul 26 16:21:50 2011 +0000

    pull-up from trunk

commit 82a61f4d9cdbf68ca95da489734cafb9b04ec6a1
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:44:19 2011 -0400

    got rid of print

commit b9cb35dd515a903a22b86848a0592779354eca23
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:43:57 2011 -0400

    got rid of more xml string comparisons

commit de066fb51d61ac9d9fc4a7cfb00de3b691f48520
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:34:19 2011 -0400

    atom test updates

commit d5fcb1b81bd40331389d2b7afe96fb59df21cfe3
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:31:16 2011 -0400

    got rid of some prints

commit 78927fc4b2c40ab17894b0ab22225b6d90b7bbbd
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:30:58 2011 -0400

    got rid of string comparisons in serializer tests

commit e3815ac263fa24b3f0b639e22fa0e6fb54b67992
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 26 11:26:33 2011 -0400

    removing objectstore and image_service flag checking

commit 47a988e2fe558174cd566a4e8fa72f0e70a09b51
Merge: a464d73 dcc64c1
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 aed2ffb102dae4f21151982e1ccdcf2b04dc5aac
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:18:08 2011 -0400

    fixed detail xml and json tests that got broken

commit 474889e1966c2273aa5867b061ada79550cc71a4
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 11:15:44 2011 -0400

    updated atom tests

commit 6394453606857d632967d8cb29fe2235f677d6b8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:57:39 2011 -0400

    Updated ServerXMLSerializer to utilize the IPXMLSerializer

commit dcc64c15b2693ddb0543f1165e85a181d397d673
Merge: b4a143a a464d73
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:47:39 2011 -0400

    merged trunk

commit 163b9d68516aec34de2f73cb2d607b5a93930cfd
Merge: 21e338a a464d73
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:33:18 2011 -0400

    merge from trunk

commit b4a143a42355c6aa8efe72338cd1680d9dd90a45
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:29:50 2011 -0400

    fix pep8 issues

commit a1039aaaf150ca879d6305416870581035ac31b9
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 09:25:34 2011 -0400

    fix issue with failing test

commit 04d28b3dd84b18ed4afad76dae339096167b53f5
Merge: e44f52a a464d73
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 26 09:22:41 2011 -0400

    merged trunk

commit f5f587b5c9cd7e278165c5f1efaafa242bfaef7b
Merge: adba749 478b7f2
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 26 10:33:05 2011 +0000

    Merge diablo-3 development from trunk (rev1322)

commit 478b7f2f738d480d3882826149dc14463d1c55d1
Merge: adba749 a464d73
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Jul 26 11:46:25 2011 +0200

    Merge diablo-3 development from trunk (rev1322)

commit a464d73e64a7876e175ee89f74c4e76bbf5d750d
Merge: 8b88202 60ea634
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 8b882023b071915ac602fd3c3d2b5a84684b336a
Merge: 9818a63 8cf5f63
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 60ea634de92b880ad31d1eadfebfed89bc62c439
Merge: 2a9f6f4 9818a63
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jul 26 09:50:05 2011 +0400

    merge with trunk, resolve conflicts

commit 2a9f6f4bdcba9266d17cdbb5f15c9698378066aa
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jul 26 09:37:48 2011 +0400

    fix pep8

commit 2cf4ef93cf1574f99000e6810448a5f561b6ed02
Author: Launchpad Translations on behalf of nova-core <>
Date:   Tue Jul 26 04:53:45 2011 +0000

    Launchpad automatic translations update.

commit 6a54cead8e2acff5e84dbcfa342a2fcdc6809204
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 23:03:01 2011 -0400

    removing rogue print

commit 9bc4d9f1770a65a93370f007101cc5025a544d50
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 22:55:37 2011 -0400

    removing xenapi_image_service flag

commit 8cf5f63ab7c4f221b5ce87cfefc62cd191ca0074
Author: Adam Johnson <adjohn@gmail.com>
Date:   Tue Jul 26 09:49:36 2011 +0900

    adding to authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2849be18d63e7cd951a6084d20bd11dac0bd8df3
Merge: c207dee 9818a63
Author: Adam Johnson <adjohn@gmail.com>
Date:   Tue Jul 26 09:41:55 2011 +0900

    fixing merge conflict

commit 21e338a4227df21d19b70589c6fdc2fcdac5f914
Merge: 7b8495b 9818a63
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 20:36:17 2011 -0400

    merge from trunk

commit 7b8495bf41ab6e7b1ee68c230fd220112435c233
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

commit c9907e03967d58d9499d6815bfbc02bae0b78866
Merge: 3862156 9818a63
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 17:17:17 2011 -0700

    merged with 1320

commit 38621564b33466f89c1a819fe7f31a1dade02c77
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 16:58:09 2011 -0700

    volume name change. some cleanup

commit 9818a6349ea63eea5fad47c9221ad236017895f7
Merge: 2e32fc8 5ac6d38
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 2e32fc86f13bdcbf8216598ddd380996ba3189c8
Merge: 9ca36dc b0253c9
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 a5c3335990c79582c29177f0dffc0434a5deb5ae
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 25 16:26:23 2011 -0700

    some cleanup. VSA flag status changes. returned some files

commit d2449b8708440ae478aa0f51867d4696b4523dfd
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Jul 25 22:38:59 2011 +0000

    Pass on auth_token

commit 865b06a9fa3eb70a237e871b5b8707d990229c6c
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 02:33:39 2011 +0400

    Warn user instead of ignoring

commit 6efcbc235cd3d76965eba04bc8400279a8ae4e4c
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 02:30:20 2011 +0400

    Added ensuring filter rules for all VMs.

commit 09a8a6afd4506fa140f90647bc601fca5549b592
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 18:28:43 2011 -0400

    atom and xml_detail working, with tests

commit 9ca36dcb308dc6a50c0c631c098cdda360aec40e
Merge: c11d3e0 b702d7b
Author: Lorin Hochstein <lorin@isi.edu>
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 65c3295cfa26f1d7a3c0c4a22c92c49d34182df5
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Tue Jul 26 01:46:40 2011 +0400

    Estetic fix.

commit c11d3e0f6f3d7d15575a2824527a71a4a43c4ddd
Merge: d168462 34a43bf
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 d168462e4296a53992e6db61106242ddb258b1be
Merge: 0238439 1c0d71c
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 0238439e0ab35b501b8540d478e34e179b88e97a
Merge: c44d798 20881dc
Author: John Tran <jtran@attinteractive.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 c44d79890eefc530610e24d50da3d66775f88ce9
Merge: a20fb15 72565d8
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 a20fb1505992e65e3447ee09bad0ed1b5c507771
Merge: cde2a16 5c1a576
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 cde2a16b4849e7e062a7a37c9e61a1210861e404
Merge: 22821b7 935a01a
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 b0253c94341098f1ae8771facce69fa963934e41
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>

commit 5c1a576462d69560bba7f4ee81c8785766fe9482
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 25 20:33:20 2011 +0000

    add a simple broken test to verify the bug

commit c86be8d3a2cf65a72772026b39b6319ee6f540b4
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.

commit 986d570221401dd31cd1a96731acbce9e3cac7a1
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jul 25 16:25:19 2011 -0400

    xml version detail working with tests

commit 5ac6d38ae334dbc16ea8b5f1115004c59008b02b
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

commit 935a01af12aa13a31bda6ef970aec159aa9476bc
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

commit 22821b78389e14aadf1a4da4994c5a523df285c6
Merge: 49a6d3c 3de24cc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 19:32:41 2011 +0000

    Fixed some typos in log lines.

commit ce2f85e97d27234653273b5537a3e83500a9c7d6
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

commit 56b7fab4f12195f677918c8df569953c872da127
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 15:08:26 2011 -0400

    reverting some wsgi-related changes

commit d89816eb6996979a3b6aba7875ccf9c98c4cbc88
Merge: 9d05406 49a6d3c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 14:53:42 2011 -0400

    merged trunk

commit 72565d80de3f1b0289d48725b2303dfeef690c4f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 14:24:59 2011 -0400

    removed print lines

commit 49a6d3cb623dd59ea6a29cfa6140ffe529b32667
Merge: cf01aa4 11ece87
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 a4fe9af38dad134a5ddb79dc17bd2502c0da5fb7
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

commit 48185f6604b44667f99e4be9904ca6dce9069f33
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 25 17:49:09 2011 +0000

    fix for reviews

commit 240b1137d1eeaed3f2a10231afd7901f587cf707
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jul 25 13:28:22 2011 -0400

    Fixed bad test
    Fixed using wrong variable

commit c207deeddf72ad630f6ea4e3885503c3f8dbfc2f
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

commit 11ece87b979113a16984cb58abf0025cc96203b3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 25 12:43:10 2011 -0400

    pep8 + spelling fixes

commit 420a11195d1dcbb2a1d7a4fb45322116ec5a32d2
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Jul 25 10:10:27 2011 -0600

    Floating IP DB tests

commit 4f915f8750ff029eddf2b95108eb2771bf56ae76
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

commit cf01aa4f46be65a8cdd813a8978a89fa880113a8
Merge: 1c3ff95 0f10cb7
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 25 16:04:18 2011 +0000

    Merge translations

commit 8fe17ad028e4bfa1703018c6bb9070dfaa9b9108
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 12:02:26 2011 -0400

    removing unnecessary assignments

commit ab6986017705b846e40eb3f82bbf0a6ea9b96ec0
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 19:59:00 2011 +0400

    Hotfix.

commit 15ae61ab29bd70cc706870bed3736de42d4cd9d3
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 19:54:23 2011 +0400

    Some estetic refactoring.

commit 1c0d71cce10143714d7eccb32df94376dacc779c
Author: Arvind Somya asomya@cisco.com <>
Date:   Mon Jul 25 11:20:23 2011 -0400

    Fixing PEP8 compliance issues.

commit 3de24cc91a74a8577cf6927d778fd14eba0fe1cd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 10:08:19 2011 -0400

    adding --fixes

commit bb7af874f033501e2d0e1c53b298528a05abdf23
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 25 10:07:32 2011 -0400

    fixing typos

commit 7b0dce97d8f6cfcfad2cb9f6e750eb278766fe0b
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 17:38:42 2011 +0400

    add decorator for 'dns' params

commit bfb0026a9f1aeba7d173e10ba273c3e99e6160df
Merge: a810867 1c3ff95
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 17:35:26 2011 +0400

    merge with trunk, resolve conflicts

commit 1c1192589c1871cd19caf7da6ad0dce75087b53b
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 15:03:02 2011 +0400

    pep8

commit 7129e760b93df868e45f8ca589b0427b2e458348
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:37:21 2011 +0400

    Fixed logging.

commit 3c288218917dde2b33e93ebbaa6783605def9839
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:33:45 2011 +0400

    Fixed id.

commit 24e8eed162e2e41a45b703c74adb1ee1340a14fb
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 14:22:38 2011 +0400

    Fixed init_host context name.

commit 0f10cb72b7e4ab7a0d4a7fa764853f3128f76a25
Merge: 1c3ff95 b4343b0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 25 10:13:21 2011 +0200

    Merge current translations

commit e96a0b9057ce74596f81e87838db312e2c1f05f0
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 25 11:06:06 2011 +0400

    Removed driver-specific autostart code.

commit a810867da3188d5b61e257abc1eba06058c5993b
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon Jul 25 09:42:58 2011 +0400

    fix 'version' command

commit 573deb67a787f014be4b2f7ce79dea0dbc20dc96
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:53:21 2011 -0700

    Add bug reference

commit d5dd0d10fe685b2be73fd7b1568954130290aba1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:35:38 2011 -0700

    Use admin context when fetching instances.

commit 049c4656db63f4330ddb75dd8bed9004868fed15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:33:57 2011 -0700

    Use subscript rather than attribute.

commit 59aa3378d9b5dbe1d5067040b94767d91aeed2bb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:30:59 2011 -0700

    Make IP allocation test work again.

commit f3d307dddc7eff6e33178f6ccef69b667764a3af
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 24 06:29:43 2011 -0700

    Adjust and re-enable relevant unit tests.

commit 0da21a171cf10dd8e78bbd51307ba1975c3f46e9
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Jul 24 00:24:31 2011 -0700

    some file attrib changes

commit 4d5df251ec51fa18bf45151ea6f60cf33bbc67ce
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Sun Jul 24 00:07:00 2011 -0700

    some cosmetic changes. Prior to merge proposal

commit 0db02618389bf7f14994eb6bcff6458a5e9c920d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat Jul 23 16:13:48 2011 -0400

    Added test_serialize_extenstions to test ExtensionsXMLSerializer.index().

commit e239201b429be4e031eb12afd0d7b68b78a8f296
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: unit tests for describe instance attribute

commit ad1908a2dbaf7ee39e52033c091f0c0acd55eea6
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()

commit ac55e84b57fb578655f5898faf19b00f28325081
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()

commit 0c4ef156fd4330f5da0bbe8f4557762efa7e018b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests/glance: unit tests for glance serializer

commit 6682498a028ab71e951b5fbd766589cdc3ed561f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:05 2011 +0900

    tests: unit tests for nova.virt

commit 766119fe4203dbe448b36e7782e63e29ba7876e6
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    tests: unit tests for nova.block_device

commit c203152e40c0a14655147e282e82bd630a025e6f
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.

commit b2c5adeffac33a47498fc1477248d81ebf6253fa
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    image/glance: teach glance block device mapping

commit 9160eab3d2e2a389eb07d92009112e01f2553edf
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

commit f3d70fa6614d7b8f0166b0a5f3149c3055ca1586
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

commit 867e2b5da9bd666a1f43de3208ed396c49450e7e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    test_metadata: make test_metadata pass

commit 058a9b4dd8a1957b024747affba80889ea18893a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:04 2011 +0900

    test_compute: make test_compute pass

commit 688cccfb9b5e16538704db627eb3d200c9525dc7
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:57:03 2011 +0900

    test_libvirt: fix up for local_gb

commit 460d3366a8e339b982d3ab2969d1633a0f2cda92
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.

commit cd4fc09e6ed39fe92d6340d8178cd6cb19950fdd
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.

commit 0fc96e35aa396a05437057d0e701049055dd81b9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 23 16:55:25 2011 +0900

    compute/api: pass down ephemeral device info

commit 83ec29448c9b9a3ba112b19acdc8602d7de1993d
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.

commit 4a3a4a85a89dc517f9ba2da1ff32beffbae58856
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()

commit c3fa0eda2b6c7e6d6505c685f42c86eabcb72276
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.

commit d2f7817f22857b61048187bbbc5de0f223806da6
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.

commit b289783339846f4f74af0f98041068bfba982d55
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

commit cb5de99ecba37ec01923a2f0b477915ef81c01c4
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.

commit b4343b0e334b76aa9099ba8b56c549498b7e19f7
Author: Launchpad Translations on behalf of nova-core <>
Date:   Sat Jul 23 05:12:38 2011 +0000

    Launchpad automatic translations update.

commit 139d7d07759262bbbadb86706b81604d49c651c1
Author: Christopher MacGown <chris@pistoncloud.com>
Date:   Fri Jul 22 20:29:37 2011 -0700

    Config-Drive happiness, minus smoketest

 Authors      |    1 +
 run_tests.sh |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit 2ccf8c99437f41ff840478491cd975f192853c3a
Merge: 663e641 1c3ff95
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 20:26:56 2011 -0700

    merged with latest nova-1308

commit 663e6415f3dfcbdc07de9a5f84c64dcea63e7c9f
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 20:25:32 2011 -0700

    more unittest changes

commit 1c3ff95bcd299114f79eb50aa75a89325df6f7f0
Merge: 0ea4047 f3256c5
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 0ea404755cd53190c614b8d8d2cae7668ace96ad
Merge: 70b9837 a24e477
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 afb356880382667618415427279b874b3f0219b3
Merge: 7b90d18 70b9837
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 17:12:14 2011 -0700

    Merged with 1306 + fix for dns change

commit f3256c5aa35ca9feacf366258463f561bef625a0
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

commit 30df521549c3141888f19bc67ec6316d0ff0007b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jul 22 16:56:00 2011 -0700

    merge

commit 7b90d18dc06e40545e716a058fa0fb3228f62334
Merge: 4fb9765 97dc55c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 16:05:14 2011 -0700

    merge with 1305

commit a24e47724228b12d94abfdb7543d26e14cb0bee8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:39:08 2011 +0000

    make sure dhcp_server is available in vlan mode

commit 70b9837e64bf484187a0a5268c9a01032db5c8c6
Merge: 97dc55c b3d54e4
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 4fb97659ed7ab01bb0ead2cade57cf71fb671afd
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 15:22:05 2011 -0700

    pep8-compliant. Prior to merge with 1305

commit 2ff26692c1a55e5872f8378e13079f3d433f7a3a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 22 15:14:29 2011 -0700

    Reverted volume driver part

commit 019c33e7d633eaa31b079fc8c5bde5afef839ff9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:12:22 2011 +0000

    pep cleanup

commit 9855f23210b7a3eb1dd8864f50f70388559b000a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 22:04:52 2011 +0000

    remove auth manager from instance helper

commit b3d54e47b882075845424c81986aa5e2eb3d3068
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 17:02:31 2011 -0500

    docstring update

commit e0e98f589971bf3229cba06cf20b8c11f13ead40
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 17:01:35 2011 -0500

    pass in the right argument

commit 32d47fea16e5a576267c48506e0e257e2eb43221
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:52:11 2011 +0000

    pull out auth manager from db

commit 8b82849042bddfa186b5c82094a6383beeb9caf3
Merge: 9e46dcf 97dc55c
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 16:48:04 2011 -0500

    merge trunk

commit 9e46dcf3c4f9b88fbacd68f2b8d97916a4b7ce71
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 16:47:37 2011 -0500

    default to None in the method signature

commit 2ed1035d5eba2efdd9a4153bd209e52702d1c4f3
Merge: 46695b8 4de6e18
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:46:55 2011 +0000

    merged trunk

commit 46695b83f17fed560a005df402aa5fe3f6385dd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:40:10 2011 +0000

    remove some more stubouts and fakes

commit 4fa2c1c4c0e347fd9fc8eb61664bd6b3650e13f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 21:36:41 2011 +0000

    clean up fake auth manager in other places

commit 97dc55c71d22209d7127fc16eb98e53647360deb
Merge: 4de6e18 89a5b9b
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 92dcf5ff025e6d6cb0235ccbcec8a371ac58ab2a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 22 17:04:26 2011 -0400

    pep8

commit 040f87b957e9986aad96fb66f679dc6c6003b369
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 22 16:54:25 2011 -0400

    updating images metadata resource

commit 10747cfb0c92bf327ad02f51bf217d98dfcf994e
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.

commit 89a5b9b9300ef17b0aeb9e81f65f367495299bd4
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

commit 93b7a5d33e7d8c23f62380e0087fb2e573131e3b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 20:41:46 2011 +0000

    fix test_access

commit 5548c15307d07ba251d0291791f93bc4719ad1cc
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...

commit 1e4e18ddb08e0f89057100ca7a6179035ab0a1dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 20:20:31 2011 +0000

    fix auth tests

commit f329e2c5af62638e73ad8791643a411cd79a23af
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit aff2b4c05a81741a7923709945248ae74d236025
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 19:54:11 2011 +0000

    fix extensions tests

commit 80e45ed87481391aab38596a24e34c0b5cb73919
Merge: c33b99b 4de6e18
Author: Jason Koelker <jason@koelker.net>
Date:   Fri Jul 22 14:52:31 2011 -0500

    merge trunk

commit 41d3f04a8a352db54c9d78ccc895949fdff89855
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 19:47:41 2011 +0000

    fix all tests

commit 1765c5060e980b783c20c391271f070413ff7022
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri Jul 22 14:17:37 2011 -0400

    pep8 fixes

commit 72df6db6805f9b9432899e4a9f183945de01d619
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Sat Jul 23 01:38:26 2011 +0900

    Updated the comments for VMWare VIF driver

commit 0a75a6b350ae55fabff62fb0f0f431c0552fd4c3
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 22 10:34:01 2011 -0400

    initial test for v1.1 detail request

commit fd2c657a57f4d8bf4266345f43543362f4ea9b79
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Fri Jul 22 17:26:11 2011 +0400

    Moved restaring instances from livbirt driver to ComputeManager.

commit cbcc1767c2c298f7a507f46606b77b22c5d4d29f
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

commit d2096dbbe853c42eb956958fd081a7d1e79bd58a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 21:36:05 2011 +0900

    Removed unused exception object

commit 30cf0b3c474567d02ccc613af27ab564b4dc22e8
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

commit 44e4d4ef8f9aaaf1346dccdf0fce3f4bbe4ac148
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 13:21:02 2011 +0400

    add decorator for multi host option

commit 216e53cf945ff39f2e812115654d97ca61d7d629
Merge: 3926a8d 0e087b4
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 14:39:12 2011 +0900

    Merged Dan's branch

commit 3926a8dc16acdd27c52d81ac3350dd5ad03db126
Merge: 3d0b64e 4de6e18
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Fri Jul 22 14:21:47 2011 +0900

    Merged trunk

commit 0e087b455a4ab2fa1965c75075630d99e659d0ac
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 22:17:37 2011 -0700

    use new 'create_vlan' field in XenAPIBridgeDriver

commit 365fe702675b12bb995c24992b469435dafdd67f
Merge: 69da20a 4de6e18
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 09:02:28 2011 +0400

    merge with trunk, resolve conflicts

commit 69da20a71f988aa9e48a23265774db9e962f0663
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 22 08:58:34 2011 +0400

    remove IPy

commit a5402dfaa34c913fde40b56b05484c711576f078
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

commit 81180741e64419bed6b0f243275684c002b85a72
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

commit 55aea660bc3eb62421107935d9edff30a2d95210
Merge: c20c6e9 4de6e18
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 23:44:45 2011 -0400

    Merge from trunk.

commit c20c6e9102367b80b2fc8686bd38ba496f84a466
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 23:36:40 2011 -0400

    Correctly add xml namespaces to extensions xml.

commit f09ac7d015c97b3103e98be304e7545dcc6668a1
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jul 21 22:35:26 2011 -0400

    Added xml serialization for GET => /extensions. Added corresponding tests.

commit 1cac713b8e77659a78d741403952c1b6aabc54b5
Merge: 1073753 3d0b64e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 18:56:34 2011 -0700

    merge ryu's branch

commit 107375342381ca7958273f8b9727cca87b9ee76f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 18:54:00 2011 -0700

    remove debugging

commit 0fc59ff76a94f9cee4bb03b90dad8dbbb4b8d709
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 22 00:39:53 2011 +0000

    fix a whole bunch of tests

commit 8605e9f0e99f269e0438faed95bf7a64419eee8f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 21 22:46:57 2011 +0000

    start removing references to AuthManager

commit a7a74dd4b335ebbd516b67e3a50c009c89536cb6
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

commit 09a03c2ce7dfd371c657013db39e346ad19a5640
Merge: a4fc760 972cf62
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 16:50:00 2011 -0500

    Resolved conflict with trunk

commit 4de6e182881c5e15137d7469223306188a9b84f9
Merge: 972cf62 cb501b3
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 c33b99b52e62041d6c33a82715b3cc9fb49675ee
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:20:32 2011 -0500

    pep8

commit e7009f234d01296a5af891c9633473ca9680ef6b
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:15:18 2011 -0500

    add in the right number of fields

commit cb501b33abc1b7dc6b0c02fef11fd8c4a50b41c7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 17:13:12 2011 -0400

    pep8

commit 1a26d09abb938ea262062052b89b6663cbfbc851
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 17:11:57 2011 -0400

    updated next-available to use utc time

commit 948b02ec6b103334dd8c87c455165d4d4ee162e8
Merge: 3b5b870 972cf62
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:10:14 2011 -0500

    merge trunk

commit 3b5b870c47b111b6162c33a13ebf943a3f93b938
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 16:09:43 2011 -0500

    rename in preperation for trunk merge

commit 254d83c58ad1fa36189105aa3a758c08808e91d0
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

commit 972cf62a56b9798ee36c08406da34dc581691cca
Merge: b2b7e72 b9faf33
Author: Dan Prince <dan.prince@rackspace.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 ee2d81af0010ce51d339680d88ba51c77f9349b4
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jul 21 15:26:48 2011 -0500

    only use the flag if it evaluates true

commit 3d0b64e7443066744322ee911d4c9b5d9d20e2aa
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

commit d3e1bdbf5123c923ec52d94e69637e8863fae189
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

commit b2b7e72d149a9ea5654b3dd7ff3df156f2adff47
Merge: 28c0e97 2fcdbdd
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 2fcdbdd13e46c71fd426ee13cf4d591b3b076cbc
Merge: eceacfd 28c0e97
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 15:14:16 2011 -0400

    merge from trunk

commit d00c5ec982a914a48d50eb98f566034d2835a322
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.

commit 28c0e972604e2ce691466b59306bb7904b677228
Merge: 20e9dd9 4f0ef88
Author: Dan Prince <dan.prince@rackspace.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 4f0ef8888359421c90bae782cb1f303e77cadff0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jul 21 14:51:55 2011 -0400

    pep8 and stuff.

commit dd5e1ac2523e6f5e2fcb8a333277faaa25ecafc5
Merge: 1cf35a6 20e9dd9
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jul 21 14:49:57 2011 -0400

    Merge w/ trunk.

commit 20e9dd97d67c8c5cbc9af65933dd215daf6bbba7
Merge: 7546a37 46be6d5
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 2fc0b87a1ea783a508c9dd6d4dd5775b798e181f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 21 11:25:02 2011 -0700

    pep8

commit 9a97c939cc9654498edc46494f321c870ecd7398
Merge: 9c27903 ba10a5c
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 b9faf3331f2a4a5e04724f20cdf749f16c0f221d
Author: Dan Prince <dan.prince@rackspace.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.

commit 7546a37566174e34727b6664a7c8195f80bc68f6
Merge: fa31b90 83201a5
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 fa31b90bc000b0e458f0901aec90da266cd236c4
Merge: c3ed8fb ebe16ff
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 c3ed8fb1f6f1fb89946f94d038a8fbfd6e9d2a79
Merge: 4ea2746 85280bb
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 a4fc7603ee36482f1e28d37724ecfe09914e65c9
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

commit b06f97a3a98d3e2417c43bbccfc74d6b483af4e5
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

commit e9e70f613d41175aae406564f6852e9d7989edbe
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

commit 4ea2746706826b6d7eb0673efb519c7b02e3c7c3
Merge: ba10a5c fc95d47
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 ba10a5c22930df40736e5ea6db8bac6091e39004
Merge: a5a3c0b 0843d9c
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 a42e461519a03465ae3e958699969554a5829169
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Thu Jul 21 21:05:55 2011 +0400

    minor fix

commit 0843d9c609105485743a1c9025939c15cc3aee45
Merge: 3f5ad95 a5a3c0b
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:55:46 2011 -0500

    Merge from trunk and moved the migration again

commit fc95d479da16b6cbfd04cbe1754f590826d5a88d
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:52:58 2011 -0500

    Some broken tests from my other merge

commit 5e5761bcdd998cc9322296403ebc1f4d9b2bebd6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 12:51:29 2011 -0400

    Fixed import issue

commit 1bbb56c999e608d1d6d8d4e66d6a96de69d6c9b8
Merge: 9b4f9a2 a5a3c0b
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 21 11:38:15 2011 -0500

    Merge from trunk

commit ebe16ff6e8fd59c0723f4b96eed95094d2c55b9d
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 12:19:09 2011 -0400

    added tests, updated pep8 fixes

commit 7a3ea72958c01cabd2cdefb207614ec8c086867a
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

commit eceacfdb1079697bfc81f7f018706a1a36fbec5b
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

commit 5ab02590401c25fbf9a31a0a06c89e3cd9b2c84b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 11:57:44 2011 -0400

    minor cleanup

commit db615f649367129167a08218331034fd5a5fd00a
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:56:15 2011 -0400

    pep8 issue

commit e65f4d4733056e083de4133a2341078a4f822bcb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 11:54:03 2011 -0400

    cleanup

commit 623bcab2604da758b6574ea5314160b42832449a
Merge: c073c49 a5a3c0b
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:42:13 2011 -0400

    merge with trunk

commit f37fd6332a8b3d20810f2e1458472a66fa08bc8d
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

commit 3c0c7614ca793ab8f3263a3239f2382b4d99f778
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jul 21 11:10:47 2011 -0400

    cleanup tests and fix pep8 issues

commit 20b956c44c8e930c73b14ceee4d711eb76fd5a3c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 23:58:25 2011 +0900

    removed vif API extension

commit 1237a474bcc990ec0d4386ee2092efcf5881aa83
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 23:55:10 2011 +0900

    Fixed Xenapi unit test error of test_rescue

commit b702d7bd636271d89a6baedad832d414f19b1bdd
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jul 21 10:47:34 2011 -0400

    Slight indentation change

 run_tests.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0d30036de51a9ba661a2ffa0ff026535811edd50
Merge: ca9c765 2319709
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 81cfe26a588603529bff0be65e9c34c7fa2ffe58
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jul 21 10:43:20 2011 -0400

    Added  call to second coverage invocation

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 3d8d2595fafb5910e9c1811b527c34ed1b961185
Author: Lorin Hochstein <lorin@isi.edu>
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 files changed, 6 insertions(+), 1 deletions(-)

commit a5a3c0b7637c3df469f530939621e4132a1173da
Merge: ee90b86 45836df
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 23197095a23547827a57a3d50efa5abad1d3daaf
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 21 07:07:34 2011 -0700

    forgot to add xenapi/vif.py

commit 1cf35a63af10cade2fe5ea972bf264464c3ee4b0
Author: Dan Prince <dan.prince@rackspace.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.

commit 9c9998542b93e8a344fa8b848ded843cd5a4fd86
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 21 09:43:25 2011 -0400

    Added LimitsXMLSerializer
    Added LimitsViewBuidlerV11Test test case

commit ca9c7650eaf8e8f6e7813f1330a9225ef28e0cba
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 22:00:20 2011 +0900

    Added create_vlan/bridge in network unit test

commit fb3bfc59e2902d64254b006e43b106b0b2d86241
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.

commit ee27c5a976f67773d1b768f4a4b0b2ec5e9e06c6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 18:41:32 2011 +0900

    Changed the default of VIF driver

commit 79328ddf72e15dde9e20fcc79a0d2a60d8f7c06e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 16:31:14 2011 +0900

    Fixed PEP8 issues

commit 02dfbdb3599279d0eacaeab15323b36bc4dbd8a1
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

commit 43408471b6ae865417dd5abb5e1732af6c39a97f
Merge: 4eb04a7 ee90b86
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 15:38:13 2011 +0900

    Merged trunk

commit 4eb04a7556bdef2f87abe1c6b334288722c285c5
Merge: 781f55d 52028b6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 14:16:18 2011 +0900

    Merged lp:~~danwent/nova/network-refactoring

commit ee90b86ae1e24f638724e012883aade77925c21e
Merge: 42e20e4 a3bb323
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 4747465286463630b57841dfdf909354420038c2
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 16:56:45 2011 -0500

    CHanges based on feedback

commit 42e20e4533920b5d4e9bea16aa49ea7f9b361c78
Merge: 47d4bf8 8c7f855
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 85280bb0e8d8e01f358e7242aff949acd3d29171
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 20 17:06:36 2011 -0400

    adding flavors xml serialization

commit ab659c2e7b7989e25d8cc14d857c9009d4aa9e46
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 16:47:17 2011 -0400

    added versions list atom test and it passes

commit 47d4bf82c6f53815e6e342341472e635faa67b83
Merge: 157ebc5 ae36d8b
Author: Dan Prince <dan.prince@rackspace.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 43bb47e10fdff99b96b5540f10f954c3778d3d92
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 15:38:29 2011 -0500

    Fix plus passing tests

commit 52028b61736d1529a50388faac682e45a915fa73
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jul 20 13:10:25 2011 -0700

    remove debug prints

commit c306272c12c5d074a938718668c72a70ea6a30c6
Merge: 0e02f8c 781f55d
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 13:06:31 2011 -0700

    merge ryu's branch

commit 0e02f8c56ac0c8996cb66d9dac5a9a8d0482729b
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

commit 157ebc5c5c7c0940b8d849ad6657044cb7aefa9c
Merge: 6fe2831 76b0835
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 3f5ad9534250c57f53edbb625673b8eb5d735279
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 14:25:23 2011 -0500

    Whoops

commit fa9ffcd76a47415ac963821724ee6f6d10ddc6df
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Wed Jul 20 20:12:19 2011 +0100

    Added LP bug num to TODO

commit 087a103d00ce9b93fea8122eca09850c5098d4c5
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Wed Jul 20 20:11:47 2011 +0100

    Split tests into 2

commit 76b0835f6ab997057bc7a3a6b1156a1f9b99d06e
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jul 20 12:10:01 2011 -0700

    Fix email address in Author

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 8c7f85596f6c595be8a785788e7180a59de4f66d
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.

commit a3bb323828fe3f12dd4b3cd0aab672c490d8517e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 18:27:15 2011 +0000

    pep8

commit 781f55d1a0f5025a8864dedf16b105fa992c575b
Merge: 46d0ba8 6fe2831
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 03:23:18 2011 +0900

    Merged trunk

commit 46d0ba832b457b13bbd674a0e1418f43eb7c7133
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a8d1802d8b64ab39d387d904ada617d00e4fc6eb
Merge: 8be950a 6fe2831
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 18:19:34 2011 +0000

    merged trunk

commit 72247fb54cdc09686e9f34c1c0a861ccf5b535cf
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:58:42 2011 +0900

    Made all but one test pass for libvirt

commit d459497e2a5b6543c8620e760e326da5577bf88d
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:57:52 2011 +0900

    Moved back allow_project_net_traffic to libvirt conn

commit ae36d8ba2cf14ee0023175c42a90df80c80b1f8e
Author: Dan Prince <dan.prince@rackspace.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.

commit 6fe2831fda7330495700cdbde2dc68245ac28e81
Merge: e483f7c d346210
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 46be6d580de8e939ad449310cdb9facc4b5cc9c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 17:46:32 2011 +0000

    add smoketests to verify image listing

commit cd9f622d87e4826dc8bf8efc4dea95b9746876c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 20 17:45:55 2011 +0000

    default image to private on register

commit e483f7c82b81f6688915bde2d0f8e65435c87227
Merge: 7539d9f f45543b
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 8ed7014308244f93e0937f6f99b766508a4e6e80
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:39:37 2011 -0500

    Stupid merge and fixed broken test

commit 5aa7dd9907726869d4a7b776597f2b594604a0c7
Merge: 1b3ccd1 1274b69
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:30:21 2011 -0500

    Merge from trunk and migration rename

commit 7539d9fafee310b317a928a36f7a53aa56647381
Merge: 1274b69 42069dc
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 1ced722d822279498f027b35be252fc3c70c3485
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 21 02:26:58 2011 +0900

    Made the compute unit tests to pass

commit 1b3ccd1585e9d2c04d135c831524068c49335963
Author: matt.dietz@rackspace.com <>
Date:   Wed Jul 20 12:26:50 2011 -0500

    Host fix

commit 8aecb87c59e11d6487b308d488c81d39c2e6568e
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

commit 4a611502ba5a6b817f0e1f1f708605c05182ede1
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 13:12:18 2011 -0400

    initial changes for application/atom+xml for versions

commit 662a40b1317fe54d1663d19cf89c25be08bbab62
Author: Adam Gandelman <adamg@canonical.com>
Date:   Wed Jul 20 10:03:56 2011 -0700

    Update Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1274b69868966a1e5b6a2c6b25788c9ac495a44d
Merge: 52d5410 50792bd
Author: John Tran <jtran@attinteractive.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 9243dcc70778854e8238a6b580bb42bfcaa3ce57
Merge: 8c0ac9c 6912a07
Author: danwent <dan@nicira.com>
Date:   Wed Jul 20 09:26:01 2011 -0700

    merge from lp:~midokura/nova/network-refactoring-l2

commit 52d5410194c8bb118c7b5d76198ad088eafc2cbc
Merge: 01f0e49 90ed598
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 f45543b42aad69fcfc7c33d3249e06f33535d5a6
Author: Scott Moser <smoser@ubuntu.com>
Date:   Wed Jul 20 12:17:44 2011 -0400

    correct indentation

commit 01f0e496cf3384083db74afaecf17d92822db0d8
Merge: 59ce94a 57555b2
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 42069dcbff2f8091d4d7354865bdddb4a211c4b9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jul 20 15:16:36 2011 +0000

    Fix permissions for plugins

commit 2547f2729f9f350e9c138235eed9af44d103e8ec
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jul 20 10:30:03 2011 -0400

    Ya! Apparently sleep helps me fix failing tests.

commit b932fbfe0efbd73f68fa0c9096b43a68cf779922
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.

commit 5aab9d0e7d9c79008faeefdeeef054a8c2ae0170
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 20 09:59:56 2011 -0400

    added 'update' field to versions

commit 6912a075c3ae0f466861eefe6e926f2d85cefc33
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 22:22:07 2011 +0900

    First attempt at vmware API VIF driver integration

commit 8ea816ca634bc0ae86849bacd84980c4a42e1afa
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 22:21:48 2011 +0900

    Removed unnecessary context parameter

commit aa75bc332db0d7706d432b9dbe020e66122d859a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 21:34:30 2011 +0900

    Merged get_configurations and plug of VIF drivers

commit dfc1b73339f1fa47de3b91cedcaf438dc7fa855c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 21:00:20 2011 +0900

    Moved ensure_vlan_bridge of vmware to VIF driver

commit 04330d141283a4155436bfd0df2f1ba19b762f73
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

commit 8c0ac9cdaa55d4805c13528c670a13987292df2b
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

commit 8247cf0b83b967930f676c812f3909728ea3c11d
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

commit 34a43bff7509355f441bd9e8112e522254abafdb
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().

commit 9c279038daaf4bc3abb58d8c04b40bb7e00623e5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 18:24:44 2011 -0700

    Modified alias ^Cd minor fixes

commit 0965b5dead0142edec612a56f055584018b9eb35
Merge: 3875339 59ce94a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jul 19 17:48:44 2011 -0700

    Merged with trunk

commit 38753392bfcca5f3927976e5e4dd81d306985a61
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

commit 1e038b67b7d82496b542d63acc8295cc18d88910
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

commit 1020652ae4cb4b529e1acbae251931bfe8a9e5f4
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

commit a53653db72a4c8ab98da085e95fd3443e68b51f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 15:29:12 2011 -0700

    have to use string 'none' and add a note

commit 097a99c7f6faa831d4aca53c50779e9a875acf66
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 15:12:24 2011 -0700

    tell glance to not filter out private images

commit a481edeabc7476b784fcfe7b981a8322cb605583
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jul 19 17:51:43 2011 -0400

    updated links to use proper atom:link per spec

commit 768cbe59c32335572902640f628fea2f00e6e0aa
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 06:42:49 2011 +0900

    Renamed setup_vif_network to plug_vif

commit 9b4f9a20ffc73fa61b7c2a3ec015abbea4107764
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 16:25:16 2011 -0500

    Fixes lp813006 - inconsistent DB API naming

commit 50792bd8c0ecabbffda165426a446152bf3c835e
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Jul 19 14:16:14 2011 -0700

    move import network to the top

commit 08edcdbb07980f97bb020f10986382cc349d4106
Merge: 77cf24e af74d8f
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 06:01:11 2011 +0900

    Merged lp:~danwent/nova/network-refactoring-l2

commit f47f52f46202fef4af19183f3f0c19c4fb2f683e
Merge: 8488acc 59ce94a
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Jul 19 13:56:28 2011 -0700

    merged from trunk

commit 8488acc22b79b178fb9246791eb110da4f4f2049
Author: John Tran <jtran@attinteractive.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

commit 77cf24e52df40e08548239a05c2f6941c688fb74
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 05:41:09 2011 +0900

    Added detroy_vif_network

commit 57555b2d258a56ff5397382e3742631fabb8905d
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 15:21:39 2011 -0500

    Functionality fixed and new test passing

commit 1c4c87913734456f330f3ae48ea8e8d59035525e
Author: Dan Prince <dan.prince@rackspace.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.

commit d34621064ffc1c5e9b27f3eb9272abdab607299c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jul 19 14:29:44 2011 -0500

    better handling of periodic network host setup

commit c68556e18a48d62b818146a598420eba714689f4
Merge: f78c0d5 59ce94a
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 04:20:15 2011 +0900

    Merged trunk

commit f78c0d5f47e2dbdc4f498d8ad8c1fd9e2ac5fd1e
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 04:12:37 2011 +0900

    Removed blank lines

commit a6d2e9e39d9917927f968004bbf22fcf78cde72a
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.

commit 8be950aa2862eeaedf7e1dc559f07c82c6455673
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 19 10:00:00 2011 -0700

    add downgrade

commit 6c66678f02e602d4accc931fa5bc013b87bd5379
Merge: 78bc1d6 59ce94a
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 11:26:50 2011 -0500

    Merge from trunk

commit 528f1c07a87ee1be76d3446795450075841878dc
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.

commit 78bc1d672f046576d34ad7c84fa8d7f229d5a45f
Author: matt.dietz@rackspace.com <>
Date:   Tue Jul 19 11:25:33 2011 -0500

    Beginnings of the patch

commit aec65d6da2281e432bacf6d4ec412502c4c0463c
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 00:58:19 2011 +0900

    Fixed equality comparison bug in libvirt XML

commit b33295e28aaa2fd6a07a4b273e2fd3164dbf93f6
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Wed Jul 20 00:57:35 2011 +0900

    Fixed bad parameters to setup_vif_networks

commit c2e3df28c28c4fa84334a600f547c83c7304fe2e
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Jul 19 11:04:36 2011 -0400

    Zapped an extra newline

 run_tests.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit f489083dc5907fe096d4ed976af44ce980d8fef6
Merge: 6dde521 59ce94a
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Tue Jul 19 15:55:22 2011 +0100

    Merged with trunk

commit c72a3e263f0b42d121746ab92cc523a0af594b8e
Author: Lorin Hochstein <lorin@isi.edu>
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(+), 0 deletions(-)

commit 45836df3b1167bc86fa0f68be6ec4823a3823066
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 19 09:36:37 2011 -0400

    respecting use_ipv6 flag if set to False

commit e44f52a900cce780f229b27d93e5c7fe658dd664
Merge: 8e1e378 59ce94a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 19 09:25:56 2011 -0400

    merged trunk

commit 9d05406fe74d045ed87f67dca475dc5a7e82ecec
Merge: 66051ba 59ce94a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 19 09:25:10 2011 -0400

    merged trunk

commit c09033a965a91c4e611bd8ece9dfe0be3e989faf
Merge: 1a860ac 59ce94a
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 af74d8fc539e18226c7d583a588d2abe34c10c5d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jul 19 00:40:05 2011 -0700

    cleanup

commit d6e38a0a060bbbef148fef929aa96bca07d48ca1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jul 19 00:26:58 2011 -0700

    merge of ovs L2 branch

commit 2933f5e5a1429fb1174b6cf48070e1d847949674
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:35:14 2011 -0700

    missed the vpn kwarg in rpc

commit 7acd78fd420ca45b821fa2d01d7aac908c249c64
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:26:38 2011 -0700

    fix bad merge

commit 5a3ab454451cd01ead9911127aa6a3ab552f39b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 17:17:30 2011 -0700

    change migration number

commit b60a0e50f738678efcb6f32c8aca6875c6c3ac0e
Merge: a7f6fb2 59ce94a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 16:58:23 2011 -0700

    merged trunk

commit 59ce94a3da83c8ddf80cb819b1d6c902685154c2
Merge: 0e8483d dc103fb
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 6d0361534cb010adbad1da608cc62d419fd2b667
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 18 17:58:33 2011 -0500

    Fixed the broken tests again

commit cb25bf752a08c197789bd7dd37deb28f617dc238
Merge: 2d649cb 35aabbf
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 18 17:20:39 2011 -0500

    Merging from upstream

commit 35aabbf4176e96625a78c90ea18b31693c8bed84
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Mon Jul 18 22:16:38 2011 +0000

    Some missed instance_id casts

commit bcfb946e31bee78fe7d4759203cba278bf446574
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 17:45:39 2011 -0400

    pep8 cleanup

commit efe15adaeb8983afa9f856004106d88f2e6f7e97
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 17:36:42 2011 -0400

    adding --fixes

commit 008ea614a3dbdf4b2f958f385b93c583c9aa8258
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

commit 7684363c3ffc3d637abfc4a390735b3cadf3422a
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 18 14:00:19 2011 -0700

    VSA schedulers reorg

commit 90017fabc6d9b7163c6250f4f40ca2212f0eb283
Merge: e87e061 ee37d85
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 18 12:19:31 2011 -0700

    Merged with trunk

commit a7f6fb28c76b15977c82bab564c03d5c787b2de4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 18 12:16:10 2011 -0700

    fix issues that were breaking vlan mode

commit 90ed598b28f4ef64873bd2db546ec136144b58db
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 18 15:09:39 2011 -0400

    fixing bad lookup

commit 0e8483d070b7d60a24511ba0b19a18c2b9504b70
Merge: ee37d85 cac5ba2
Author: Dan Prince <dan.prince@rackspace.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 cac5ba203e7f248d6f71143648a9d5e6f92228c2
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Jul 18 13:18:16 2011 -0400

    Don't jsonify the inject_file response. It is already json.

commit 35306b95ad8c28f23ba9dc014d180a2c0075c812
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

commit 2fb543b0d0529764868721a631718d8b30679e87
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Mon Jul 18 08:59:00 2011 -0700

    Added auth info to XML

commit fd49aca3a6cf8b3eecccc44693e09dc377e7005b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Jul 18 10:29:49 2011 -0400

    returncode is an integer.

commit 6c3deea2512e8eaad8151fd5312a375c65b5872d
Merge: ee37d85 9847045
Author: Arvind Somy <asomya@cisco.com>
Date:   Mon Jul 18 10:04:13 2011 -0400

    - Fixed the conflift in vmops.py

commit 4c9b3531d8cecc8ad0037245f655ce8b666a901c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Jul 18 09:38:50 2011 -0400

    Check returncode in get_agent_features.

commit 20881dc51c1d3e8d5bc0c72321d6d8507138fcd7
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Jul 18 03:45:16 2011 +0000

    resolved pep8 issues

commit 81ab2f7afd374c9c979e35aba6ba2a4be8a6e9be
Merge: 94bcc77 ee37d85
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Jul 18 03:03:57 2011 +0000

    merged from trunk

commit 8e1e378201e96d3b47cb8a20c9bc4e7bfb70527b
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

commit 71352a8e8c3cd031e1c711ffd4d2d422c08f546e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 22:29:28 2011 -0400

    pep8

commit 01e15edf61abd900324e6d1485f8bbae1f40a113
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 22:28:16 2011 -0400

    updated servers to use ServerXMLSerializer

commit 7af4622fa639a93aaf7ec52da673623809e8a512
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 21:36:57 2011 -0400

    added 'create' to server XML serializer

commit 9e0b13dab57a7f1329023d54a238b79b0b5aae8e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 21:24:02 2011 -0400

    added 'detail' to server XML serializer

commit 6dde52119779fc9c3343223729071d53f65dcec1
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Mon Jul 18 00:41:51 2011 +0100

    convert group_name to string, incase it's a long

commit 8908dbff6e7afd04167bcab9bfdb8c0b61a74043
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Mon Jul 18 00:22:01 2011 +0100

    nova/api/ec2/cloud.py: Rearranged imports to be alphabetical as per HACKING.

commit 9c06903f3f44d873d4ce3dbc9f9f190a5c9758ed
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Mon Jul 18 00:16:53 2011 +0100

    pep8'd

commit cb55cf368013af9f1b92e695d78a85ff61a84225
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.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.

commit d53f97bb2bd867b2d417a39cad86b8ccdb80a633
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Sun Jul 17 23:52:50 2011 +0100

    Some basic validation for creating ec2 security groups. (LP: #715443)

commit 94bcc77ef8812c3c8b173f303448931c1067c4b4
Author: John Tran <jtran@attinteractive.com>
Date:   Sun Jul 17 22:07:07 2011 +0000

    changed to avoid localization test failure

commit cf83142e499435642f525ef6517d513672e05daf
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.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.

commit 87d0eaf6bfedc68e03de3213e9c47c10c0d0b942
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sun Jul 17 14:50:44 2011 -0400

    added index to servers xml serializer

commit 6d33d0013c2e15fe04d4ae1c464b53a3156da9e7
Author: Dan Prince <dan.prince@rackspace.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.

commit f55cc57e3df2b692acd63ecf3b68cf7bc310a1cd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sat Jul 16 19:45:28 2011 -0400

    pep8

commit 83432fd389312d5de218c80914de524234215da1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Sat Jul 16 19:39:27 2011 -0400

    Moved Metadata Serialization Test

commit edeb2058ad28bff248e8721b71d2df8b16a21022
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

commit 80d0a2720d636537d00987379d355e6740a07c59
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:25:37 2011 -0700

    added missing drive_types.py

commit c128606080449c94deb2f0ce92d632a7efb12a1c
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:11:13 2011 -0700

    added missing instance_get_all_by_vsa

commit 8de4c22e9cfc983a0595de274368adce2d13c475
Merge: 274a36a ee37d85
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 18:04:01 2011 -0700

    merged with 1280

commit 274a36a36686fb8a82cae1f78518c98344792555
Author: vladimir.p <vladimir@zadarastorage.com>
Date:   Fri Jul 15 17:56:27 2011 -0700

    VSA: first cut. merged with 1279

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ee37d852a8aa03bc4dd1ee0a386b40c1d63c93c6
Merge: 5afd861 4dbbdc5
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 a6f63d003874c24cf45052021edba7952620786a
Author: John Tran <jtran@attinteractive.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

commit 66051ba8af47ac5f22ae932f804629a45d41852c
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

commit 6a82e1d7eb578691e50fe93b6a8711777ce0d64c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 16:30:39 2011 -0400

    Added ServerXMLSerializationTest

commit 0b2c5b04228cea6fa35333cceb884a419bcccac6
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 16:04:41 2011 -0400

    take out print statements

commit 5afd861c8502bb0aec2cf8ab74a98aafb41304dc
Merge: 735f524 cc1c146
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 2d649cbc84be6f05867b3fbcf8f519cfda68bab9
Author: matt.dietz@rackspace.com <>
Date:   Fri Jul 15 14:20:44 2011 -0500

    One last nit

commit 64c83a2b2eeb2f59601791f1a7c41d7544705597
Merge: c7ec610 9bc5dc5
Author: matt.dietz@rackspace.com <>
Date:   Fri Jul 15 14:17:04 2011 -0500

    Tests passing again

commit f158170f1adc88fe2e73fa36ea882546bffb7cc7
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:14:58 2011 -0400

    put maxDiff in setUp

commit 8752133eeb2fb5cdfef94f9ad0c86ba2924e5591
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:10:15 2011 -0400

    remove get_uuid_from_href and tests

commit a9e461f3618b60d37d1885442aa1734610653b2c
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 15:08:31 2011 -0400

    stop using get_uuid_from_href for now

commit 9bc5dc5bc890aba069757e6b28f88d9b8e27391e
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Fri Jul 15 19:07:58 2011 +0000

    Updated with some changes from manual testing

commit 0d25902963a3dd943d44e5439bb97ad8e9852ff4
Author: Dan Prince <dan.prince@rackspace.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.

commit 08b51b39e8be6fb194c07c3043082e2590bf8076
Merge: 5d558ca 735f524
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 15 14:46:47 2011 -0400

    merging trunk

commit 9c9bdac44c4d81baaa388e6e542882ad3daaec4a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 14:43:33 2011 -0400

    use id in links instead of uuid

commit 476fc2f4778e5da7b5b844e5ff882cdd4a716676
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 14:05:26 2011 -0400

    pep8 fixes

commit 1023efbcb898f2787e95faba4a3e0361df274c2b
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 13:45:56 2011 -0400

    fix ServersViewBuilderV11Tests

commit 735f52457320d5a8f10529b2416af9ca59ff4f26
Merge: 9f43708 02f2ecc
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 7126ba8ca69798e4692f5cf9e2af0674d046d61c
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 12:44:40 2011 -0400

    return id and uuid for now

commit 543003af74c6a3ec8051c7129256809e1e40a20a
Merge: 9c2d42c 61e5957
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 12:09:21 2011 -0400

    merge with trunk

commit 9f4370899b19941b0a8291ed965cfb86d2a73dc9
Merge: 61e5957 098b638
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 9c2d42cde8215d7ccdcb70531d0fd35f0efab6c6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:48:09 2011 -0400

    Added more view builder tests

commit 25e3c651bcc059a3efdf6dd1f6760d2bd0c81c25
Merge: ea53785 c42075d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:31:02 2011 -0400

    merged wills revisions

commit ea537857067a2f938f0e2f1a635533b82cb93aea
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jul 15 10:29:06 2011 -0400

    Added ViewBuilderV11 tests
    Fixed bug with build detail

commit c42075d95ef12948fc8a52a4d0f2aea24b08c80b
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jul 15 09:57:28 2011 -0400

    fix issues with uuid and old tests

commit 61e5957b2cdfd7c4b563e09cdbe6bcb39141e4e3
Merge: ede3b22 98d85ae
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 ede3b22406b727ed8a992a3d9378b1945c23aefa
Merge: 776fd5e 6775ca1
Author: Dan Prince <dan.prince@rackspace.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 4dbbdc5da160c20b0be260ed1dd4624e50757304
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.

commit 691672ef8855c2e4aec24d22c9a488a27c479af9
Merge: 1bd9ab0 776fd5e
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 11:46:33 2011 +0400

    merge with trunk, resolve conflicts

commit 1bd9ab0fa34142a34cf3087dc5574552bf6833d4
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 11:13:21 2011 +0400

    remove argument help from docstrings + minor fix

commit 776fd5eadaa1a5b72b9059fa68a0d0c1a5b41207
Merge: 17b4a46 97c3b23
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 17b4a46ca332c06d0a3fa32862c49d512848c5ba
Merge: 4406dd7 775150d
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 9d0f3d2033197d58e4d8f3ddd0042936b86af6f4
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jul 15 10:39:23 2011 +0400

    Add possibility to call commands without subcommands.

commit 0aeef08aa1f232b9d7132e7e1f1c5a0615f68780
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jul 15 08:27:16 2011 +0400

    fix redundency

commit 97c3b23a0171332026d580927e0410086f89bbfe
Author: Stephanie Reese <reese.sm@gmail.com>
Date:   Thu Jul 14 23:12:42 2011 -0400

    Updated Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e9f5a42cb415d264657f5b141599cfa1326309d4
Author: Stephanie Reese <reese.sm@gmail.com>
Date:   Thu Jul 14 23:09:28 2011 -0400

    Fixed remove_version_from_href
    Added tests

commit e87e0617ec189b36355ebe5faa519361b0ab6fbf
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

commit 66be587cc7d4bb5a8480cdc10b9cf57a9ed7497d
Merge: fc0d5cb 4406dd7
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 fc0d5cba85781ac1da76188ec1f321f9dbacae07
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jul 14 15:53:16 2011 -0700

    added integrated unit testcases and minor fixes

commit c7ec610673ec745bdcdc38c03498e10339b76efe
Author: matt.dietz@rackspace.com <>
Date:   Thu Jul 14 17:49:29 2011 -0500

    First pass

commit 775150da9cbbc6ab49dc4b8d4a4973098b3b1389
Merge: 51a9796 0f4f762
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jul 14 22:26:19 2011 +0000

    Merge with trunk

commit 4406dd7565ce1ce3f9513bdac718f14b82ef5255
Merge: ad49b03 b4be259
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 b4be25952543c082cf9ea242c09dfe443a5e676a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jul 14 16:52:27 2011 -0500

    catching the correct exception

commit 3281b51503d5771b28ffc060cd6cd37d5cca6303
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

commit 9a59d9d94e1c26075a4cbc409678e436550723d5
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 16:02:52 2011 -0400

    pep8

commit a1c7518119c863978ad795b457e5c221e046b0fd
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 15:55:47 2011 -0400

    Updated old tests

commit ad49b03b7baa703e59fd6f897135ce2e70fd7a5e
Merge: 32ce82e f02215a
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 98d85ae7e70b0138fa984560fc3ba023e02dc3e1
Merge: 204abd7 32ce82e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 14:47:14 2011 -0400

    merging trunk

commit 2bd1f6c3dec4c32e535d87764e22e942eca5ea04
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 14:35:11 2011 -0400

    removed self links from flavors

commit cea4e7a937f131f8f46ec03c38a1c84e7be06346
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jul 14 22:34:49 2011 +0400

    added commands

commit 204abd77eef89792296f6e8c3276e8abf351975b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 14:23:23 2011 -0400

    exposing floating ips

commit a14a2220f9b42b84698d245dfab24e5e2540f526
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 14:01:04 2011 -0400

    updated image entity for servers requests

commit 6775ca15da614e87452d4e2bf39ab19027e6d173
Author: Dan Prince <dan.prince@rackspace.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).

commit 02f2ecc1600efdefa78c1b03a5a514bb3718638c
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

commit bd212f67f43184362b9a6c2c43b2ba38ce715f6a
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 14 13:25:40 2011 -0400

    Added progress attribute to servers responses

commit 84b9a2a387e6284aa39b1c1887a63416dbae1f73
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 13:25:05 2011 -0400

    fixing bad merge

commit a32833680cc70096d4cdccdb617ff81630c005cc
Merge: c3d4e00 32ce82e
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 c3d4e00429019885964d18105a99cadecffb88f8
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

commit cc1c14655a48f7a43bccc266deb036ded8cb8aa7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jul 14 12:03:06 2011 -0400

    adding bookmark to images index

commit efcbc056866dd95c5bf7c4d86f7d2ea724b0370e
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

commit 83201a59ac70109886e5aec8b272a7771304dd93
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

commit f02215a1b329fe6f01488a8458c16fbd68deab02
Author: Scott Moser <smoser@ubuntu.com>
Date:   Thu Jul 14 07:08:02 2011 -0400

    add self to authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a7956a089d220230942b5744ebc644baba2f428c
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

commit d8277c133c6c37abcddba28d3ced2e56d9827c8d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 19:32:17 2011 -0400

    adding new query parameters

commit a5e0520ed5611f9cf01054942414be189885a05e
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

commit 32ce82ebe45f9873333923bc9eec0b0361d3d8de
Merge: 381f6a2 93fe034
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 633526aec92e159bf21f32be509d849675adfd76
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 13 13:57:50 2011 -0700

    Minor fixes

commit 3f0e38b7267d39a984eea78fd72bd412d28a7152
Merge: 9867532 d0cbca8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jul 13 13:56:35 2011 -0700

    Merged with Trunk

commit 3f01117c6f86df91ba8e9d86859ae8ef6d863f55
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

commit 381f6a20e4056b4a849a8b567b36db56ed876511
Merge: d0cbca8 6eca60c
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 ea18cb16fd8dce8ddc60c5350c76c6b782090f0b
Merge: 2761d5d 093fcd8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 16:01:11 2011 -0400

    merge

commit 2761d5d2bf49254184f067bf2b45bde71fc59da8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 15:59:05 2011 -0400

    beginning server detail spec 1.1 fixup

commit defdda73e0767d22e44069d19338de974b4b9e13
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

commit 093fcd8aa22f850ccf492fdbde2ed1f7c6dd1076
Merge: 1e3c702 d0cbca8
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jul 13 15:11:11 2011 -0400

    merge from trunk

commit 9867532a1853a8537df84cd1a0ebbc61039ed4de
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

commit d0cbca88cd34c92e09b29f008dd93cf891e82ac7
Merge: 914f460 375abf5
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 375abf507d93d95a4194fbc7464411f7c995e6b5
Merge: 521114a 914f460
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 13 11:19:32 2011 -0700

    trunk merge

commit 4c7ad03fe22a4584ddc08d4281e7e125c1d2147c
Merge: 64d7787 914f460
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 14:05:38 2011 -0400

    merging trunk

commit 64d77871160ff65fd1e193e0b53e11a0b4db60dd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 14:02:44 2011 -0400

    updating testing; simplifying instance-level code

commit 5d558ca99e67da8ab987ce6c1e949151f19f775d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 13 11:17:05 2011 -0400

    pep8

commit c809edcc5eb556afec58cb8bcb302e94fe7d2ea3
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

commit 1e3c702e4f4338bb47a7af55bda538a452f7b8d4
Merge: 914f460 e8df113
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 098b638790819d9d87d611420ee75d73b33faf83
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

commit 6eca60c9374205052af58f256f6d28c82a02344c
Merge: e8df113 914f460
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 13 09:24:32 2011 -0400

    merged trunk

commit 914f4601100fb882c5a6ca69e848a08ff45fd4ec
Merge: ff1cac9 f703302
Author: Dan Prince <dan.prince@rackspace.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 f7033026ab7a2efc0e01455cac378b9497635d76
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jul 13 08:34:41 2011 -0400

    Added Mohammed Naser to Authors file.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a9363b9c7064401a4017dd4edaadcf6b6914691a
Merge: ef8a99c ff1cac9
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jul 13 11:18:16 2011 +0400

    merge with trunk

commit 1a860acf52e405f9e067e3adac8b13a6c874e2fe
Merge: 61aa023 0e150e7
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jul 13 14:38:15 2011 +0900

    fix reviewer's comment

commit ff1cac9858053387bd9d2e7b4636ef7357d7d989
Merge: 0e150e7 6ac5560
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 04fa2f0af78e3cdb22d65246568fd5f9769d596c
Author: Dan Prince <dan.prince@rackspace.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.

commit 2bd712c6c6d04490ef6752154812808f1bb01477
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)

commit 202d1aae47a435848af715299d43fb8d906d487a
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Tue Jul 12 19:12:21 2011 -0400

    Made sure the network manager accepts kwargs for FlatManager

commit 0e150e73470a8ad55240a36222ea33a4d67d252b
Merge: bddc757 11bfa9d
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 438e36b3b25f63d8d966f88912d56253f34a0b30
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 12 16:02:39 2011 -0400

    cleanup

commit 2740ab44db107e0fe40b955c768e90cf7f13a392
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jul 12 14:35:09 2011 -0400

    server create deserialization functional and tested

commit 5deb3baedfab9c0dc41374426142d79bc7ed7133
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

commit e8df113126a613f071e59040508381c4bf1d171f
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

commit 93fe0340bd69134c624c373d199bdb098cf36976
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

commit 2453cbce5d1d39d817eb26f2557ae467b88d382b
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

commit b1f6add51da689f0c3c2ce27e767c2d294599f88
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 13:29:26 2011 -0400

    minor cleanup

commit 5f9c8a988daefb31051f91b35e835777337d06eb
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

commit 8ee4bf93e74c2796d51ef09981cf34bd0f9eb1f1
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

commit f9de22600afba4380b8f72f80b8db6b7793d6fab
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:42:56 2011 -0400

    updated images tests

commit 65bab25e3f5d2ccb4c94e81d05784a9cefa6595e
Merge: f00f756 bddc757
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:13:02 2011 -0400

    merged trunk

commit f00f756b71a5c4ce890a0b776553901a2aac2082
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jul 12 12:11:49 2011 -0400

    pep8

commit 21e6ba93dd24c626d9dde112081811a437798dc1
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

commit 11bfa9d422e3ba4842a14838c41ba8e4524d5548
Author: Alexander Sakhnov <asakhnov@mirantis.com>
Date:   Tue Jul 12 19:47:26 2011 +0400

    Fix PEP8 for 809316 bugfix.

commit ec15e0c0d0fbd836c86d0c44381e86de7c84bf8f
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 61aa023ce1c9a49f51d25a7341d2b99b47675c30
Merge: a1f421f bddc757
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jul 12 17:59:24 2011 +0900

    fix reviewer's comment

commit 6ac5560e567eaee6bd73cf780b61e1a334b32fbf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:59:01 2011 -0700

    stray debug

commit fad47da8284accc1e8177debebf8bb91e8b55ceb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:49:46 2011 -0700

    pep8

commit 433bfadb01d5ecb68f3e518c19935db56cced1de
Merge: 5f4d21c d4abefa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 18:40:45 2011 -0700

    fixed marshalling problem to cast_compute...

commit 1cb3d9076ff38a593d6f8db49cf3b2b1f635f2a2
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 16:02:46 2011 -0700

    fixed all failed unit test cases

commit bddc75778919d158f5deb303a1e7a2b6505ce354
Merge: fc6884a 02ec349
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 fc6884ab68a17f68eb56362db050a0b052b7586c
Merge: 480d50b 080484a
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 02ec349b1d912612b8d93705427e571060e0a9a7
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 16:26:46 2011 -0500

    Bad test

commit eb460b0f09c53a0683135eb35294b62ad94c2457
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 14:25:51 2011 -0700

    unknowingly made these changes, reverting to original

commit 080484a2736236e1c94e5a5d74932a8c6eee94e2
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

commit 284efc71d59fc310b1b3333ba0160dba25c20265
Merge: 2c911f5 480d50b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jul 11 13:38:35 2011 -0700

    Merged with Trunk

commit 52d74e35aa0411a2e504c1b025ba1ba3484c73bb
Merge: 61d53b8 480d50b
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:37:03 2011 -0500

    Merge from trunk

commit 2c911f53c7bc7081bff3be20cbe51b64f8be8d8f
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

commit 61d53b84a2a2123318376d5f7adcdf2a3ece05c8
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:31:39 2011 -0500

    Changed broken perms

commit 1adce1b145f04fbf7511baf967a5aa4cc5da7d2e
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 15:08:53 2011 -0500

    Tests

commit 480d50bb4f51569da29109d798a1ded222265071
Merge: 1c3cb80 6b2c9a6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 19:47:23 2011 +0000

    Made xen plugins rpm noarch.

commit 1c3cb809d68edd76ecac21bf8e3e516af22b774e
Merge: d4b9c87 9e71074
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 f07551f32b1950f25b86f9d584185f12512106c6
Merge: 58c380c d4b9c87
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 14:25:08 2011 -0500

    Merge from trunk

commit 6b2c9a6ae15eba2d2ecd10c4bad915e50c349882
Merge: 5c93f4e d4b9c87
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 15:13:37 2011 -0400

    Merge from trunk.

commit 5c93f4efccb5f5408a37db51395ecc148502b26f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jul 11 15:12:47 2011 -0400

    Making the xen plugins rpm to be noarch.

commit 9e71074536289615ae1f883390bfa6fdebd8bd56
Merge: f66d2c0 d4b9c87
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 14:41:29 2011 -0400

    merging trunk

commit d4b9c872bec71119d793dbdee10226e30a62dfe7
Merge: 1c85e28 66a6101
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 1c85e28eb2a3f900b90a84d4126bc5ecaa2d12ec
Merge: d4abefa 6396898
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 f66d2c0e3272143638d233911e6c6ad1efe08327
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:29:56 2011 -0400

    updating code to implement tests

commit f841d5bcc673130d498389f10f9737054ca40488
Merge: 1810f05 66a6101
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:26:22 2011 -0400

    merging parent wsgi-refactor

commit 66a6101efe838c1423079e60b497297981878bda
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 13:16:22 2011 -0400

    allowing controllers to return Nonew

commit 1810f0584dd9a33443dd1c82f647b70627eea788
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:34:07 2011 -0400

    adding headers serializer

commit cd62fa9b1d256efe46e38a3cdc03418ddacdf5d8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:33:53 2011 -0400

    pep8

commit c9fbd5bd780de1ccace7576d55ebfd35877c98ea
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 12:31:38 2011 -0400

    minor refactoring

commit 58c380c3e6a867b7cc1c0674fc8854fbb121d8e9
Merge: 8e80f7c d4abefa
Author: matt.dietz@rackspace.com <>
Date:   Mon Jul 11 11:16:22 2011 -0500

    Merge from trunk

commit 5f4d21c556dc2a253a891a752fadd33fc82326a2
Merge: 6ee1b33 33d20dc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 09:13:55 2011 -0700

    minor tweaks

commit d4abefa8032d5cd9749b14647c7dd4095c1a6ac4
Merge: a153024 03be702
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 03be702d5074a3accb6df0c746a3007732caf622
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

commit a153024ab59f729d017c3e01cad728b5e6c842d9
Merge: 33d20dc 15df43d
Author: Devendra Modium <dmodium@isi.edu>
Date:   Mon Jul 11 15:11:13 2011 +0000

    Fix the bug 800759.

commit 1a72f56dca92850919a357806ee442b6638a0c08
Merge: fa8cd74 de996c8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 10:51:24 2011 -0400

    merging wsgi-refactor

commit fa8cd74eb1c64217ba35b4d55e08fd5f83ad22f2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jul 11 10:50:49 2011 -0400

    adding 204 response code

commit 6ee1b338b02b662123b42ffaf0cf7c9729402a8f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jul 11 07:49:34 2011 -0700

    pre trunk merge

commit 15df43d0293e7c711d7145730271b795ad607953
Author: Devendra Modium <dmodium@isi.edu>
Date:   Mon Jul 11 10:48:32 2011 -0400

    Missing Author updated

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 33d20dc2521d1f772d2e12b52bad240f219db78b
Merge: d327766 0f62ded
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 d327766d9838343c74c1b6db26662806867a0159
Merge: fec8bf8 c3a38c5
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 a1f421f623680b4d43a630ed4527ab82d797d6a7
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jul 11 16:31:31 2011 +0900

    fix comments

commit dbf466fed03a74e0441185d80d9dc1ea8d909ee7
Merge: 4e0daf6 443c629
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jul 11 14:58:57 2011 +0900

    fix conflict

commit 707dec4edc54da228b46276374816d8f6b55ea32
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

commit e920403f4701695b77b4c01e5c95145b36e5b6ef
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Mon Jul 11 04:38:27 2011 +0900

    Moved 'setup_compute_network' logic into the virt layer

commit a87bdf55764ac565b5a539fc906925a84c274abb
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Sat Jul 9 22:00:27 2011 -0400

    Added myself to authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit d753703f8345b24b9830686590edaff3a2311b42
Author: Mohammed Naser <mnaser@vexxhost.com>
Date:   Sat Jul 9 21:45:54 2011 -0400

    Fixed two typos in rescue API command

commit fec8bf88582ebbfeec399f0fdd82c462517b8200
Merge: 8542668 518f674
Author: John Tran <jtran@attinteractive.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 85426682db5fedb0395eaddbc9af0d6ff88542ae
Merge: 86e6b67 a9edbe0
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 240a13e011df9a1e0cc7d3d2e0433a256791d024
Merge: 58ae187 86e6b67
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 19:03:31 2011 -0700

    merged trunk

commit 58ae1871882c147f0e751679d74a2a0392397a69
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 8 18:58:24 2011 -0700

    fix tests

commit 9cdaba8d26d40b596f4825755754da1767ed7ff5
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

commit 64121d3a52fa7bdf2ae68feb06adde75e2e77d77
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

commit 86e6b67d5d9a8fe5ce106d5135ef131aa1756d72
Merge: f3bec04 fc9f7e7
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 f3bec049c9d245ad803c2454dfd734e3067a39fe
Merge: d40c07c dff0b9d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 22:26:09 2011 +0000

    Add a flag to disable ec2 or osapi.

commit dff0b9d44dedab7d755214d628892eebcb650a1e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 17:12:14 2011 -0500

    Add a flag to disable ec2 or osapi.

commit de996c8b24a5b9d8fa0fc4185e4de3916b5214e8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 17:40:56 2011 -0400

    refactor

commit 53a756b08b01b2652fc4366a184522424b3c06de
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 17:21:58 2011 -0400

    easing up content-type restrictions

commit 518f674d1a22c8fbbb255abb03479e8680cd181f
Author: John Tran <jtran@attinteractive.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.'

commit fc9f7e7c4292ca3e931bd584578c27f3289d53cc
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 14:50:52 2011 -0500

    Updated resize docstring.

commit 00387adfeb53d0bc3d76593d71c1f2a6808e1fc0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 8 15:19:19 2011 -0400

    removing Content-Length requirement

commit b5e29f873b3be65646bdd01693cb5acb784b9992
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 14:10:32 2011 -0500

    Add docstrings for multinic extension

commit a2d359489249361e2a0a0c6f53728b3ac76a7987
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 13:06:37 2011 -0500

    Add support for remove_fixed_ip()

commit 170e63dd373134074c8d0096b847334d66a9e089
Merge: 7ed371b d40c07c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 12:27:59 2011 -0500

    Merged trunk.

commit 519ebf91e35962efce83593418381aefacc31cf3
Merge: 5171191 d40c07c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jul 8 12:21:26 2011 -0500

    pull-up from trunk

commit 7ed371b2af6bb7df4607178ddd56b7823556a7b4
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 11:47:34 2011 -0500

    Added unit tests.

commit 1755c591658d48a9994ee17459416ce773b66c7b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jul 8 10:59:17 2011 -0500

    First take at migrations.

commit d40c07c83643a1a2bb3481c59d73a1ab7939a07b
Merge: e700614 bb035d2
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 dc103fb279f6279ec730c23d18f34eb9b5165a66
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.

commit bb035d2f5954212852b6800a91ee44b896f0d18e
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 files changed, 2 insertions(+), 1 deletions(-)

commit b6cc20aac9f3572edc33c6fba839ec3b15094856
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

commit bc6f6a78bde756576b6cb5e81bd9404ce608488c
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 15:36:18 2011 +0900

    nova/compute/api.py: fixed mismerge

commit 7e59ce2f84ac922050c8f410e651f0ce0cfe047e
Author: John Tran <jtran@attinteractive.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

commit c5273c66e447fd818fd9792278581fa598e28df4
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 12:09:50 2011 +0900

    sqlalchemy/migrate: resolved version conflict

commit 3fd93823d1612a65a28ce8f397a301cbd12a6830
Merge: 42e1a78 e700614
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jul 8 12:07:58 2011 +0900

    merge with trunk

commit 5171191a36481a24b41887dcb15103b7e22a11f6
Merge: 70f9639 e700614
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:47:42 2011 -0500

    pull-up from trunk

commit 70f96390931dcc03e8464693eefd28bfd8a5c0cc
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:46:55 2011 -0500

    unit test suite for the multinic extension

commit ef0b5d0feb1efce9dd3aa0302e94b0478cf70f7a
Merge: acd42e9 e48080d
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jul 7 16:46:34 2011 -0500

    pull-up from trunk

commit f48abd024d19b91101d08e0092033abf340da709
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

commit e2278070b642930745d73fbd52a05db17f0acc9d
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 16:47:23 2011 -0400

    Merging issues

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 0845fd98754db8f4f5860a0510dea38692925b6e
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

commit 55f5b7add8507f9a94abeb901cc80f900e8452eb
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

commit 93e468b587c300cc9f84d48bdf0623e72ae5ff01
Merge: e3a8f17 e700614
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 16:30:58 2011 -0400

    Merging issuse

commit 984fa48d6aa66d10eec36233138895d15a721a05
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

commit e588f9a2c83ab55ea906de610d1b31bebfd4d190
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 16:19:21 2011 -0400

    Removed serverRef from some tests and viewbuilder

commit e3a8f179bc8982bc5834e26d4b4150ec9241e551
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 15:55:34 2011 -0400

    Comments for bugfix800759 and pep8

commit e02bbd590e230a0b6dd5a45582f43f479f66d7bc
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:51:12 2011 -0400

    Removed bookmark link from non detailed image viewbuilder

commit e700614860bdd6a57202ac214a6489909d2e446a
Merge: 1b0bce5 790eb3f
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 1b0bce557732fb26abffcc4b5e639a62d676ba96
Merge: 91f731f 8b72e6e
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 26f0ac1513d41c9b1a7b4f8cd3f2b8341fb5d305
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

commit 91f731fdbb4e42a95adc3534f7b8990e873c8f30
Merge: e48080d 2cd1b26
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 c058faacd826c03c2b19a8789e782995305cdbda
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:09:23 2011 -0400

    Dried up images XML serialization

commit fc800668cdf56ef4ba4745e5d99c4515535f7aa2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 14:08:57 2011 -0400

    Dried up images XML serialization

commit a9edbe074c2f0e58a87bfe7df58905ed6d2ea151
Merge: 0076a30 e48080d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 10:20:35 2011 -0700

    stricter zone_id checking

commit 0171654b08bc5a62ca851e36a3b1c8f38f4f161f
Merge: d9559be e48080d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 09:53:46 2011 -0700

    trunk merge

commit d9559be315930277f042a823ef87283811e49155
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 09:45:00 2011 -0700

    cleanup

commit 300589a8a1b9b3e2387fd929bbef528f4ec23f81
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:36:45 2011 -0400

    Added image index

commit 40e303640985e5f9d838bf19df538e1753c88e48
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jul 7 15:36:39 2011 +0000

    pep8 fixes

commit a982234e8340b8f6704ebb21b30404185580570c
Author: Devendra Modium <dmodium@isi.edu>
Date:   Thu Jul 7 11:25:45 2011 -0400

    Comments Incorporated for Bug800759

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ab600b8bdea98cf894e3f203a246d15e3fc8acaa
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.

commit 2e4bdda987af9252d47e6bf9485c7b56a4a51639
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:11:40 2011 -0400

    fixed image create response test

commit bcd9ebe04edd621426f36fe4700540b69319a6ea
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 11:06:35 2011 -0400

    Updated test_detail

commit c5669245e893778a4e02d586bcf5c2c2ed15654d
Merge: 8961ff0 e48080d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 10:51:16 2011 -0400

    Merged trunk

commit 8961ff0e8c036e37b548dcca822ad66e0065e44f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Jul 7 10:48:17 2011 -0400

    make server and image metadata optional

commit e48080d77ce6ab47b59ab2f5055b8eab58431200
Merge: e9e7bf8 b4d5db9
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 b4d5db9b8d83b93f25e7565ded4c907afcf2ba5c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 10:02:06 2011 -0400

    pep8

commit 46021e15ca456fe03c8ad353b833608b150aab9b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 09:42:13 2011 -0400

    Renamed function

commit 60d60193a4de567c174e860f9bc10ad5be46ceb6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jul 7 09:26:25 2011 -0400

    moved remove_version to common.py

commit 68d6c4f895545c1a52798e1f218428cba878263a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jul 7 06:25:03 2011 -0700

    unit tests

commit 0e779020a0bffac5f80498971fb9baed7d88b918
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Jul 7 09:24:40 2011 -0400

    progress and server are optional

commit 2506588c678e94825c87916c0995a145a55b36e7
Merge: b5da1b1 e6c102b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jul 7 05:56:15 2011 -0700

    merged trunk

commit e9e7bf80634a341b2792d8f004a37d2d5356fcc2
Merge: 443c629 19f5896
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 19f58964d8a797b34cb2a9b1e2c95d1e80e23835
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jul 7 08:10:45 2011 +0200

    pep8 compliance

commit acd42e928abd4bfa7a0f683c58fa96cbd509c2a0
Merge: 8a740b8 443c629
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 8fa854f75811dfa8dfce84e23fb4393722f2126c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 6 13:43:48 2011 -0700

    changed calling signature to be (instance_id, address)

commit 96250d781b12dd4c61dc981f0c0e5aaf7c78741e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jul 6 16:40:00 2011 -0400

    correct test_show

commit b71a3106c123c24aff87d5493b15567b3f9fcbe5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jul 6 16:28:10 2011 -0400

    first round

commit d63aca33cca59f64f3b9cb764d49690c9e9cc095
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 6 12:58:04 2011 -0700

    removed extra comment

commit a4f07593f41567a6745125caed5486c67eaf8a8f
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jul 6 14:47:41 2011 -0400

    Further test update and begin correcting serialization

commit d3216d27f012745b6e3550cbc5c976dd49c28deb
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 03:16:28 2011 +0900

    Removed a typo error in libvirt connection.py

commit 952d5b4816a63e895b00fc92d2953e3b53e3692d
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

commit 8b72e6e294141749bb9ad75dd03b4ca48841a26c
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jul 6 17:14:46 2011 +0000

    pep8 fixes

commit 81289a501e3ea7aeb53821687e979ff55e330023
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 02:13:18 2011 +0900

    Added VIF driver concept

commit f5bed4634e3dd4e686eeac80048ed9a881726ea8
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 02:12:03 2011 +0900

    Added the missing 'self' parameter

commit 3f585a7b54a82b8b467f6488e3ec070040c349de
Merge: 2e6ec87 443c629
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jul 6 17:02:00 2011 +0000

    after trunk merge

commit 2e6ec874681c00895578c7e2e27515678acef62a
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.

commit b99b4549e7fae6c9499064ae290ff5b329e725c7
Author: Ryu Ishimoto <ryu@midokura.jp>
Date:   Thu Jul 7 01:04:56 2011 +0900

    Added net_attrs argument for ensure_bridge/vlan methods

commit 4d0141de95c419aa11daa5447309e453cdfb75ba
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b5da1b1dd45d390b10b024b48463fcb89979a8af
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 08:25:28 2011 -0700

    wrap list comparison in test with set()s

commit 1c7ee58b480380985d8ad5c1cae5cf70368a902c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jul 6 08:14:58 2011 -0700

    slightly more fleshed out call path

commit 87fdf26e2b5d7c1a294cc523167e7e0fffd042f7
Merge: f03e29b 600d831
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 08:12:44 2011 -0700

    merged trunk

commit f03e29b043e5a6cb5c4a6611d0e76781b4e2a7a1
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

commit c428a4599d2c15d9b56add61860986bbf0e82ecb
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

commit 90ec1dd0bee8827f12f78f7cb955781911fe2c21
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

commit c460543303a50cd3c36d14ca057684d7adf62e8f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 6 05:41:47 2011 -0700

    clean up OS API servers getting

commit 468ae241702e8b886f638202a3a01ce7cb6d85c7
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

commit b736529f5015778fd5e63e0b57ca6e209c1a1663
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:59:22 2011 -0700

    pep8 fix

commit 838ede0a0b5c67272163e0141cf5e129e7358147
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

commit 8da427e6a27fe64ad55d5feb1720974e8a4a051c
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.

commit afb2605ef389be3ab1389b79c14067b2c7572c0a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 17:30:07 2011 -0700

    pep8 fixes

commit a928ba6c9e7d42472c9a8a231f0766388b138ed0
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

commit 1094ede0b9134ef8c4df3b3f4c2b3673b90d4ab2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 16:30:55 2011 -0700

    test fixes.. one more to go

commit 55feab688c73b5a19fb9fc75e354f2e0fcc0367b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 15:04:36 2011 -0700

    resolved conflict incorrectly from trunk merge

commit b139ac26d408e2523c76c7d1fd7046ee5dc5cc79
Merge: 997290b 6a7955e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:58:42 2011 -0700

    merged trunk

commit 997290ba7b82cc555fcce5c177f55f7014bb2a8d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:47:05 2011 -0700

    doc string fix

commit 899451818daf0edd9036c6b3a60ecaa2b03e187d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 14:40:06 2011 -0700

    fix OS API tests

commit 09202d526d7317b7b8f761c40b53538cdf78dcf3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 13:59:57 2011 -0700

    test fixes and typos

commit 01f5042b3674267cfea189514d27ff808dab82f2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 4 01:45:42 2011 -0700

    typos

commit 881c7b0306f5be90b50c1f3897b38afa6bce91ef
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()

commit 76e7a7eade1f1c61fd8c5e036d5f52025a24b03e
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

commit 5015bf230fbed9043806a7d04cbd12e019294a14
Merge: 99db81c 54876f7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 01:32:26 2011 -0700

    merged trunk

commit 99db81c8054ca0e5ae47f9d32a855edff59c0478
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:55:33 2011 -0700

    remove debug from failing test

commit beb2f6017983406d35d867e6d0796eefb4c100c9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:53:13 2011 -0700

    remove faults.Fault wrapper on exceptions

commit a35d49a4dbcc1419636e9286bbcd35358d8bf48a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Aug 3 00:46:38 2011 -0700

    rework OS API checking of search options

commit 22c47f2bbca5f32e965261a723c4d59875c08b74
Merge: 4547973 0591a60
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 27 17:04:06 2011 -0700

    merged trunk

commit 45479734f86016b76cb5f85940e9987e87bc8013
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:35:42 2011 -0700

    missing doc strings for fixed_ip calls I renamed

commit c747da70c02e6630b8a40824cd865ec831c9b870
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:29:42 2011 -0700

    clarify a couple comments

commit aa6c151dba30ed86a54e45c19d7f2ffd45630d16
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:22:02 2011 -0700

    test fixes after unknown option string changes

commit 2d916237eeebdf8cd06249dcb2c2bea6c5676be3
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:16:23 2011 -0700

    minor fixups

commit 5951ebd7cd5148d92d767e447ba617ddb2ee6433
Merge: 71c378f 6fe2831
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 12:01:11 2011 -0700

    merged trunk

commit 71c378f4d94fb40d53db3556feb26d1d62e6a14b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:48:52 2011 -0700

    pep8 fixes

commit 8850b0700a0d22db49777922cb9196d8e71312f8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:43:56 2011 -0700

    test fix for renamed get_by_fixed_ip call

commit a99b34ee0163ee34e5458d9fbfbb43bde1e763d2
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jul 20 11:32:43 2011 -0700

    ec2 fixes

commit 4fa723065bfab9f20ee9e8115a090d1ab04f3d8b
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

commit de0b6076780ac4fed3ba9c7a6c7f65cba791ba66
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

commit 924484a6f71d19e199f7652479b5eecd6a53eb3f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 04:13:22 2011 -0700

    another typo

commit 03442adf502a75ea3bd0ce5812c16f583ea225b7
Merge: ff94a95 ee37d85
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:49:55 2011 -0700

    merged trunk

commit ff94a955dd6c11e089f7538f79f4dc678834295b
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

commit 2f8800d7022cee44466376c5cbd4c68b5f811560
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:08:23 2011 -0700

    more typos

commit 285c0a3f51a0b4f72f50e2a290948b92ce9f09e1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 18 03:02:50 2011 -0700

    typos

commit b3d35fd1a4134d3b9ee3e7fbd8c762a52857591c
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

commit 2743dfc8364b735b3184f08d279e4195ad1c8de0
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

commit 3fdeded27435db309879f7db8de3c881d2788a63
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

commit 6d4471d48d44fc6ac5f118a943f0b94de3c95852
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

commit 0f1b1f866d123dfc3379e0804b159c6f028be8ac
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.

commit 71a8f8999e8a32f2a7587a13705674573dd3d3ee
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

commit b68053bf0a806682e731af67001a70d7d122de5d
Merge: 6eab4bc 0e150e7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 16:13:01 2011 -0700

    merged trunk

commit 6eab4bc5395e117d1403c23cf033330b79f85698
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 files changed, 1 insertions(+), 1 deletions(-)

commit 8606fd786e136bc45bb4e045a709d7a67c1ad40f
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

commit ba951eb9e161da15e9e04bb0c61a7604bdcedd85
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jul 12 02:01:09 2011 -0700

    added searching by instance name
    added unit tests

commit 90028fc6cf504318bbf9a49dd7ff163240d82f05
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jul 11 14:45:27 2011 -0700

    pep8 fixes

commit 2d2aa163a9ac9f75cbd9116ef56fc8910ecc6dd9
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.

commit 040550273efdda483673a2a8173bf9681668e017
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

commit 443c629c193388f6c29409db80d4bcb1706a887c
Merge: 16f77f1 8d54c21
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 4b95bb7d246cbe425295ea63c75389b603e9f2f4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 17:07:44 2011 -0700

    fix libvirt test

commit 21be17cfa31021c1ebcb3f26d6d8d9523b282039
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 17:01:19 2011 -0700

    update tests

commit 8897ce78a56b4491377f045533c25e886ad2a6cd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 16:24:43 2011 -0700

    don't set network host for multi_host networks

commit baf43baecc7e7c3714bd49c991f973329f595042
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

commit c753a71c2770999ed0507ed8bb6acec92aa966fd
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

commit 0b66e8db9d50ea48c8e56714e49f0fb432ea40f7
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

commit e0b885f5fcb5ba30a26b120b7f14a35e4d941d88
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 01:31:04 2011 +0400

    PEP8 passed.

commit ac0e0d6a9175c34ba8cf8c9c5b54d5b1130007c8
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 01:09:00 2011 +0400

    Formatting fix.

commit 293dae010846766e0737e060d0a308a34d18fb21
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 00:43:39 2011 +0400

    Proper Author section insertion (thx Eldar).

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit db8a47d0f3b1a67528601541202cdf8d595c574b
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Wed Jul 6 00:24:55 2011 +0400

    Signal handler cleanup, proper ^C handling.

commit d09b48f630edd5b0ba4e7b0c6351a0f0f0b865dd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jul 5 13:24:31 2011 -0700

    copy paste

commit 808fe146cd0a2a0ed8d9b7e6b25a6ab50a0f288c
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

commit 0076a3071f71aee591130495f44166a7ffc941c8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jul 5 12:16:35 2011 -0700

    fixed zone id check

commit 9f7dc9e722505d9b88e31d3fd7201e5bb92656ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 5 12:00:11 2011 -0700

    it is multi_host not multi_gateway

commit 23414dbb803928a24e0ce4e944c8f77fa7ff9d2e
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

commit 869f28d70f6de06b2d123ea29d844f4265fbcc3e
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'
    .

commit 2cd1b2652daeba9971456691a9a2927e2e428005
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jul 5 08:32:04 2011 -0400

    UML doesnt do vnc as well

commit 4e0daf6e5b7602f8b9fcee5d7d679d3fc3aeb212
Merge: 0acf643 6f9b452
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 1b62d4fdb7ea276e2a13997f6003ea27c44cf6c8
Merge: 50173c5 d0544cd
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 23:51:43 2011 +0400

    Merge diverged braches.

commit 50173c56872b36df750fdc15a43d0257442b5fe8
Author: Nikolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 23:48:05 2011 +0400

    Gracefull shutdown of nova-api.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 229ff28eabcedbc2e86654c496e1d1f99f660827
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

commit d0544cd5bad9db084e67182a0d6e8bbc0e7b30bd
Author: Nickolay Sokolov <nsokolov@griddynamics.com>
Date:   Mon Jul 4 21:03:01 2011 +0400

    Gracefull shutdown of nova-api.

commit 790eb3f6d8a039b80d506d06ebc3e3a65a208760
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)

commit e262afdb5cb518f17a5deb898efeacf4b5632648
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

commit 34d872e69837b5f09f9171eda280644e1ebbf6bf
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.

commit 8d54c21a9f95d1e4bac5efd393530defc3450218
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 files changed, 1 insertions(+), 1 deletions(-)

commit 24d91307abdd66a34a25ee66d79308d5808997b6
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.

commit 893d3d4aa91377c6a5b5ace43b06dece0796fe74
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

commit da2504284ac29ea544576afeee3d3b18fd844501
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 20:39:56 2011 +0000

    removed unneeded old commented code

commit f5bb963059dc363a8a71084db4a645e9e0735808
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 20:33:00 2011 +0000

    removed more stray debug output

commit 942f4fb8751bea5ee1f8691f8dd090b6d396b3c3
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:53:06 2011 +0000

    removed debugging output

commit beb341ae1ebabd5f63ca92538650be14a31b2b59
Merge: 77fa6d0 16f77f1
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:44:30 2011 +0000

    after trunk merge

commit 77fa6d07361f299ffa068c53a1800449b78c2d24
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 19:44:10 2011 +0000

    Updated unit tests

commit 0f62ded9c25734606bf7de489f0a766b46688cb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 1 12:03:27 2011 -0700

    remove logging statement

commit 4199fa0c7438754b0d484a306c75dc7d15927c73
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

commit e69a1090054ea17e1ebd249cf859f3cba51faf73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 1 11:12:13 2011 -0700

    use url parse instead of manually splitting

commit 92107d18ff1ed9ae7792a0e1abdea1078b9193f8
Merge: 11c085a 16f77f1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 1 19:06:18 2011 +0100

    Merge trunk
    Fixing docstrings

commit 007671fd6a627a2aaf925ce8b7037ae55f553654
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

commit 16f77f147ad79d08c469078d90b5139efe2c4cc9
Merge: b6a3cb4 d1006f9
Author: John Tran <jtran@attinteractive.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 b6a3cb40059e48c57f895fa405c4f70b569a719e
Merge: 8f9ba72 03ec0ef
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 1 15:41:25 2011 +0000

    Removes 'import IPy' introduced in recent commit

commit 03ec0ef5a4e4a78fd8d6fb47f154485c2803424d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jul 1 11:20:04 2011 -0400

    removing IPy import

commit 521114aac16290ebc164011617a73352681df957
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 08:09:19 2011 -0700

    trunk merge

commit 8f9ba725c2488dc839611557b07de900566f8bab
Merge: 97cb02b 52702d4
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 3065279e3fc38106235f994e7c4d2790a6eb4730
Merge: c04c085 97cb02b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:53:20 2011 -0700

    fix up tests

commit c04c085c5a44fca07f716ac87c403b7fb84839c1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:38:17 2011 -0700

    tweak

commit bbf00c1c2538d51154eca04b7127fa252b9acda0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jul 1 07:31:17 2011 -0700

    review fixes

commit 292e6ab35afb77242758faf144fd6cd8953f8a63
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 14:26:05 2011 +0000

    completed api changes. still need plugin changes

commit 97cb02bb1fea44347afac16247ebfe4c80428663
Merge: 233397a cd87aaa
Author: Dan Prince <dan.prince@rackspace.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 47af264653f81df7723f5a124fdc49ad1aa9c1b5
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jul 1 13:44:12 2011 +0000

    after trunk merge

commit 233397a1452b0ae052e396f900d7e248a5f5eb0e
Merge: e542dde 418a11b
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 418a11b1f9762c1238e1f13680e81f059d2c976b
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 files changed, 1 insertions(+), 0 deletions(-)

commit e542ddea5a313d0ec9ad8756d229016040dd7ff5
Merge: 05aadf4 a876960
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jul 1 09:25:03 2011 +0000

    Ensure auto-delete is false on Topic Queues.

commit d1006f922d824af822acb44f2cebdde170153677
Author: John Tran <jtran@attinteractive.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

commit a876960d096da18f97719a2d8601cf11cf4514f8
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.

commit 8e80f7cdff6e13ca899f8f2150e3dcae5b11d389
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 30 16:49:03 2011 -0500

    Merge from trunk

commit 05aadf47b7c421777ce49c4086ee96d4063b3bee
Merge: 9c7dc20 6d76366
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 6d7636644067e4e9e0918bcdf8a8d4272f0d1004
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jun 30 20:51:59 2011 +0000

    Added the '--fixes' tag to link to bug.

commit fcf73c3fcc19307bddf8371c82039927d8081881
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.

commit 9c7dc20e45f6f9db5e57552d1888bc23631783cf
Merge: 6daac4b 6101cf2
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 30 20:47:11 2011 +0000

    added multi-nic support

commit 6101cf22df5777e895c2b5d41eff67317eb2d91e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 30 15:03:42 2011 -0500

    osapi test_servers fixed_ip -> fixed_ips

commit 2f6151ca885ee6876760263778e59445a45a074a
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

commit 12153e9f86d89625658dcd063173a3ca3f3527df
Merge: a044127 6daac4b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 30 14:20:59 2011 -0500

    trunk merge with migration renumbering

commit 6daac4b0cebc0d4a24f171a3d4fc55658f21b463
Merge: 5e47997 f34dbb9
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 0bc7bd8cde07c805290a5fe4e031873728a0d8fd
Author: Joseph Suh <jsuh@isi.edu>
Date:   Thu Jun 30 14:24:27 2011 -0400

    fix bug 800759

commit 5e47997a96657fe2e6c56e38bc81c62cbd58d015
Merge: 393534e 9752b68
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 9752b68a11de20d597fee2d4a7c6c9710e741fdb
Merge: dd068f1 393534e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 30 11:11:03 2011 -0700

    trunk merge

commit dd068f16dddf1dd2b032267ec6fc7a4c0574e4cb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 30 11:02:57 2011 -0700

    blah

commit 52702d41caee983efde6e43a6b495c6775bf7beb
Merge: 89d4060 393534e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 13:55:15 2011 -0400

    merge trunk

commit 78250f033dc43b796390adbb0bc41dbc39f5876d
Merge: a077670 393534e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:49:54 2011 -0400

    merged trunk

commit 393534e249b091b89dfb7fb6457bbc406618a0ba
Merge: 4244f6a 0f4f762
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 4244f6aeaa6f6de33cc8a445ca933ce40f696cbd
Merge: 8b33555 1dd6384
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 a077670f9b36b5fde7b39bbb377354f420c0e457
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:29:45 2011 -0400

    updated images

commit 1e694f8058aa3813bcb16160a9e5ff89a13ecd30
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 11:18:19 2011 -0400

    updated servers

commit 5d9cf5e9398755933daf0061cc879c646a77cc9e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 10:29:31 2011 -0400

    refactored flavors viewbuilder

commit c073c49baa7a99ddc3e35ea57ba3fa67a5b789d3
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 30 10:12:10 2011 -0400

    fixes lp:803615

commit 1cf7d1a80c6f1a5a810760769730ebfa302e102e
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 30 10:06:06 2011 -0400

    added FlavorRef exception handling on create instance

commit 89d4060fffd8a3c48634b1a84f573d061c505c02
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 30 09:28:21 2011 -0400

    refactored instance type code

commit 8b33555f3a513b0dd2232ee43b4dbeaff0f93a91
Merge: f95b9be 92f00dd
Author: Dan Prince <dan.prince@rackspace.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 f95b9be28481c6ed16a9d911465f32e94e3c3fb6
Merge: 6f9b452 f286ba7
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 f286ba7610b87cb285e184f3bf51ab21d202a75c
Merge: d232195 6f9b452
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 30 08:46:33 2011 -0400

    merging trunk

commit 1dd6384de8851dafda9677aeb583246775311909
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Jun 30 15:43:18 2011 +0400

    PEP8 fix.

commit 73af3ffebf10cc3655c7dd79b139e0d7208f028c
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

commit 8c656c481e83da05efbaea7c9b0dc91cb461c349
Merge: a1dbaf3 6f9b452
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 30 08:32:24 2011 +0200

    Merge trunk and resolve bin/nova-vncproxy conflict

commit 9f2bc70a37334fec2154acf106d84363dc5487d3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 20:02:30 2011 -0700

    clean up

commit 92f00dd49a6578486239d9862a032bb29e33431f
Author: Dan Prince <dan.prince@rackspace.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.

commit 52f7866f67411582eeda2249f2feefccaddc54e9
Merge: 345d7e6 6f9b452
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:36:53 2011 -0700

    trunk merge

commit 345d7e6bde5675ded9a684750e4a35358b4bc58c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:19:40 2011 -0700

    pep8

commit fc0fde05328e644c490e550dfc553f616b9afc92
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:11:27 2011 -0700

    pep8

commit 470db620f59a9909ec73a35eb33c3b49ccf22c10
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 19:10:11 2011 -0700

    done and done

commit cd87aaa873183d951e20037276ccdbe9531e4b8b
Author: Dan Prince <dan.prince@rackspace.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.

commit 084626b65a565e92b61ead2a9b1e1d56f7fe5c94
Merge: b59014c 1cd6711
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 18:30:15 2011 -0700

    phew ... working

commit 6f9b4523fc8f5680a6b5cadd51d39ea88988e56f
Merge: 559c95f 2249450
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 32996a66d90c7b50f0a04e69765071a06ed641d5
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

commit 22494509ee0adff2a98d735bb1f86179527dd61b
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

commit a044127f6ec0903edead212454cb403cf002be73
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 17:19:47 2011 -0500

    fixed incorrect assumption that nullable defaults to false

commit c1c506e744238656f9e6edfb94d0c8d1ac4ef11f
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

commit ec4671db37b0262da4ae1475fcb530b7a79e042a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 17:06:58 2011 -0500

    changes a few instance refs

commit 643c6aee6417930bf1c3471ede615fa8253253ed
Merge: 33a9868 559c95f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 16:44:42 2011 -0500

    merged trunk

commit 0f4f762a5a775422e0b706b9b4e121150b8f6c8f
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

commit 33a9868abd44abf3521ecb2f981006f236b4fb84
Merge: 1ac3d35 03d0f4f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 16:39:05 2011 -0500

    pulled in koelkers test changes

commit 03d0f4fbe58f389502f1faef7f6b3ece3b7580da
Merge: 2b01c07 1ac3d35
Author: Jason Koelker <jason@koelker.net>
Date:   Wed Jun 29 14:42:32 2011 -0500

    merge with trey

commit 2b01c07f224550ac59c41650f960701a31df9a35
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

commit af073acc59e9d45502cdec8b7219e45123999519
Merge: 5067372 559c95f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 12:26:04 2011 -0700

    Merged trunk

commit 559c95ff7fec448511ccbab0073eea8c15bc67bb
Merge: a4f8e0e 249cd04
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 506737265aa7c3555c6e05b595999ed6488f8487
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

commit adba749fd7d0840daae96151d13af9e1253e8592
Merge: 9fbefb0 249cd04
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 a4f8e0e6357cd86be4010f6c79f1c9a5239c2c87
Merge: 1cd6711 516ba11
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 249cd040c2e6b606d8b5fd9ced686e120037b025
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

commit 1ac3d35b9bf3237459edbadcb5426d06be1d7f36
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 13:17:22 2011 -0500

    more incorrect list type casting in create_network

commit fc5e830c0a2ca46171cc249e0a818c0b74263297
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

commit 8e8e35d7587689d0c050828f0696805f59c92831
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 29 13:04:04 2011 -0500

    renumbered migrations again

commit f34dbb988aa77553634f9a0d4f607535df37bf16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 29 11:00:37 2011 -0700

    Make sure test setup is run for subdirectories

commit 9258e4f072f3323ef4a22c17fd7d789dde63773f
Merge: bc0d4bd c49aa0b
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 b59014c496502148d3bf5b674fdc8885ecd84bf0
Merge: b05565c eaf2a19
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 10:47:30 2011 -0700

    trunk merge

commit 1cd6711755ae5fba685b5ddd0b81c648f30d562c
Merge: 28b4201 a0c377c
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 28b4201424d25df35896a3673aa98c490fab6f21
Merge: 6c88a70 884f25f
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 2cdeede4451e6e9564cdf443dffdb1a2dcd8e0d5
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

commit 516ba11bfc9957cc3f3a558197ff06a469695c55
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

commit b2d983d9564ea171643022e5327b9b2ce573027c
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 17:38:02 2011 +0100

    pep8 fix

commit 650c7daced5fd66f69387ea72b2cbb3ef088dce2
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

commit 2ce07ef099a298b3be4052e34ba9742d36028c5d
Merge: 06b90b6 6c88a70
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 17:23:10 2011 +0100

    get latest branch

commit 6c88a70612596636fa25ddcbb08602cfbcf16879
Merge: eaf2a19 68e579b
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 edae35492e7c72e585f8ece31ff2ab6d811b43a4
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

commit 77cf81c72e34e6c064155c0d71c5f07a45b4a274
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 files changed, 1 insertions(+), 1 deletions(-)

commit 19b1ec4eaea080da9415def7abff3d6262b9be72
Merge: c8aabe0 eaf2a19
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Jun 29 08:29:35 2011 -0700

    Merged trunk

commit 20e3b4212049c3a1785f5cf5b8ed20ae0efdc968
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 08:29:13 2011 -0700

    pip requires

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 06b90b61bac95b53c4bee0ee112c09613c0ee1ab
Merge: d8a6094 eaf2a19
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 16:18:33 2011 +0100

    adopt merge

commit d8a6094bd31abd483414b4f5ebd7ecff515e6269
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Wed Jun 29 16:17:33 2011 +0100

    clean up logging for iso SR search

commit b05565c2194cfb0b6a098aa607d15ed12aec04ee
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 08:14:43 2011 -0700

    moved to wrap_exception approach

commit f96b16bf12fd1bdc22eb5b5e7929f634a8c20c2f
Merge: ab967bf eaf2a19
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 29 15:09:29 2011 +0000

    Merge with trunk

commit a0c377c17eb0317fd0cb3c00e2a2e444fc54a5b1
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 29 16:52:55 2011 +0200

    Fix 'undefined name 'e'' pylint error

commit 68e579b569a0ec3982f238e1f091113163a4e9b1
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 files changed, 4 insertions(+), 2 deletions(-)

commit 7d5b7d5c4d56816d17fad31e28623f9782c1dc06
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Jun 29 16:45:46 2011 +0200

    Fix nova-manage vm list

commit eaf2a1951fe5590c811ce38720f1d8a1c6e44d88
Merge: 004955e 1080b7f
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 9bf5189ac93747e24088d95801be9bd2a5233165
Merge: a4e7d64 004955e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 29 06:24:09 2011 -0700

    moved migration again & trunk merge

commit 6ffee9c2d7d3a28bd7fc3f6c69a84d85c6044858
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 14:07:59 2011 +0400

    Brought back that encode under condition.

commit 195d129ce4e0d232b5ac09b50b0b786cc5527c63
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 13:37:24 2011 +0400

    Add test for hostname generation.

commit 50999fe2eae692b8cc254acd06c3e7573423154b
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 29 13:17:16 2011 +0400

    Remove unnessesary (and possibly failing) encoding.

commit 9fbefb0dd1d7ee9bf2fdcb1a4a71df03aaf8ed9c
Merge: c4c7c7e 18ed9ff
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 07a0e72bfb84add10c9652710973bee9fcd2f818
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 28 21:04:50 2011 -0700

    moved to wrap_exception decorator

commit 884f25f9b40a7964e210b6ffb5b47796b48ca6bb
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 18:50:17 2011 -0500

    Review feedback

commit 25e02bb94bd5000b47b6183dff24bc8f1c41726b
Merge: 5629596 004955e
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 18:13:23 2011 -0500

    Merged trunk

commit 004955e2adf3c2f851bc68376b51d483386f98d0
Merge: c9e47a3 18ed9ff
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 22:43:32 2011 +0000

    Put possible_topdir back in nova-api.

commit 18ed9fff9cc111571f3eae3670f5ad0e0e8d7c9a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 17:26:08 2011 -0500

    Use milestone cut.

commit 5629596a1ee6f8adcaf0188306a23dfa3efb3154
Merge: 51bf625 c9e47a3
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 17:05:41 2011 -0500

    Merged trunk

commit 51bf625fae54ec875c94d9744f5e5068c1a504e8
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 16:54:25 2011 -0500

    Let glance handle sorting.

commit d23219562cabbb5c56fd2e2fe56080b6bf187b47
Merge: 1ba5731 c9e47a3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 28 17:42:21 2011 -0400

    merging trunk

commit 3453fcc36fc446ec685ecfbd268a84ef64137d34
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 16:03:41 2011 -0500

    Review feedback.

commit c9e47a379168db960883683838aeaf74012464c3
Merge: c49aa0b dbe3cfa
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 dbe3cfa0693177e52b9312d736880b6af3b320b2
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 20:37:05 2011 +0000

    Refactored usage generation

commit 5c5829ecb6bd8113d22fb5b59c7d0a1f9f08ce20
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:26:00 2011 -0500

    pep8

commit c740ad093f67254cc540c5a1f2b24eff691d5bd3
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:25:08 2011 -0500

    remove zombie file

commit c25b72e67004d5b10de92c3c83a0947a5fd210c0
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 28 15:20:24 2011 -0500

    remove unecessary cast to list

commit 1aeb0c167c903e3ac8cd394d5f8165fff178e1da
Merge: 2eced5d bc0d4bd
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 28 15:17:58 2011 -0500

    merge with trey

commit 2ceb5ad7f6e1766dc569c7cf64ff436854c78056
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 15:17:23 2011 -0500

    OOPS

commit 7bf287d86337ae9021047406b8197f442fb9b272
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 14:58:34 2011 -0500

    Whoops.

commit 8e9276704147101d0cafe1807d4e9f1efa82448d
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 28 14:49:40 2011 -0500

    Review feedback.

commit bc0d4bdfa83257c133a0ca3c135cae78056d2ee9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 28 11:20:02 2011 -0500

    skipping another libvirt test

commit fbb95615934ba4c6021a9b9e68dbbd680353f0d4
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 16:08:27 2011 +0000

    Fix merge issue in compute unittest.

commit c4c7c7ebeac8cc7eed5769cce6028db6eff13f8c
Merge: 2ef53f4 3e8c49e
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jun 28 16:05:20 2011 +0000

    Merge diablo-2 development work

commit 1ba5731b2c797f130c6377084aaff3f07f6dab08
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 28 11:59:46 2011 -0400

    adding unicode support to image metadata

commit 0d24efc9554852b1d7276ee2190f14e602482eec
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:59:44 2011 +0000

    Fix thinko in previous fix :P

commit c8aabe0109f7a05bb2594ede06a6870f6cb5b0d5
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

commit 47a641ea0bcebf36d8a8d82ed2b9ba32a7f55eb0
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:50:07 2011 +0000

    Fix yet more merge-skew.

commit 2eced5d662b47ac2e2d51b8e777462a713659269
Merge: 40122a3 0482248
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 28 10:49:58 2011 -0500

    merge with trey

commit 3e8c49e29da57901571f2f63ed667d2362f28018
Merge: 2ef53f4 c49aa0b
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Jun 28 17:32:59 2011 +0200

    Merge diablo-2 development from trunk (rev1221)

commit c49aa0b9ef0bc5cd5b77c08626d90dc35191c958
Merge: cf4c705 dd9f1b6
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 799b38a3ce44f1883e342cc02fd331ca02b92005
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 15:21:08 2011 +0000

    Fix issues due to renming of imange_id attrib.

commit cf4c7054eb5ce30622637a19610e973bba3b6d09
Merge: d28b4a7 a0a6e4c
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 70de71d2ae4433dd8e720b938c88ad032b92b6d3
Merge: 3ddbc11 d28b4a7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:12:56 2011 -0700

    Merged trunk

commit 3ddbc11a441968bee8d15dfbd468d06ba0fb4490
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

commit 0659e262e104eff36df25a68d48760841da357ce
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Jun 28 08:08:13 2011 -0700

    log formatting typo
    pep8 fixes

commit dd9f1b6cbe99181cf3914bf83a2083294725b1d3
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.

commit a0a6e4c6a33960cd45b9f843eff45f0d235d0c64
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 28 10:43:25 2011 -0400

    pep8 fix

commit 202eb9cc9237b9b735c5482eb1a6e32fda642002
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 28 10:39:04 2011 -0400

    I accidently the whole unittest2

commit d28b4a7d39ea002ca175a4d8ec97e315e475070c
Merge: 7db4ce8 bd9bd7b
Author: Lorin Hochstein <lorin@isi.edu>
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 653fb40870e43b0991742ba8a1c27716c1124235
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 28 05:51:40 2011 -0700

    refactoring to compute from scheduler

commit ef8a99c4245febe87878795acd0e4580765b9cf1
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue Jun 28 16:46:50 2011 +0400

    remove network to project bind

commit 8088b892590c1a876712933df2b69e80601bce99
Merge: 9882f2c 7db4ce8
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:44:29 2011 +0100

    resync with trunk.

commit 9882f2c98a6e678b469b61f57cd4f72fb74cfd4b
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:34:17 2011 +0100

    Add test for spawn from an ISO.

commit 8f831bfda59ce35f7adb876134d835dac6ccdb06
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue Jun 28 12:33:12 2011 +0100

    Add fake SR with ISO content type.

commit 6d734e0b0701e50f14077d8d77eb539a8c3f338e
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.

commit 9cf875a0e411d46f77992f847a878a4c6e1c55b1
Merge: 180a462 7db4ce8
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 10:23:00 2011 +0000

    remerged trunk

commit 180a4623580a501e8246c417067bd925bc776c1c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Jun 28 09:08:35 2011 +0000

    Fix pep8 nits in audit script

commit 092683931e4b2612eafb67b90e085cab5ec86c50
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.

commit 1adfb76f84d4e23d3005095aa63ae515ebb69672
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 27 20:21:45 2011 -0700

    getting started

commit 7db4ce8acbc51ce9d22728e07e233880f35eaddf
Merge: 536939b 15a25c1
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jun 28 00:23:19 2011 +0000

    Added floating IP support in OS API

commit 536939b45d0963a5400d0e46c48441da6ec72df4
Merge: 0da514e c83b2fc
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 04822489006bc16164c7f962c8fbf62955d1f1bb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 17:49:07 2011 -0500

    small formatting change

commit 10840737c7096857dcb477fe68e38d19d08b2b8a
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Jun 27 15:30:56 2011 -0700

    breaking up into individual tests for security_groups

commit 0da514e161c960cb07188f443803c4c0a1c18019
Merge: 217c11a 9b6d511
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 1cdf20be8fe536e68a651af683aec069f5c79040
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Jun 27 15:17:19 2011 -0700

    logging fixes

commit a5d9ea4d6d7cee84f2cc6aef0629e045b8470d18
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

commit cb059a193f9dc075526ad8026b5d2c559d057eda
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.

commit 9bd8ec89ee1bc4876602d35f2d4709af02b3047f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 27 16:50:17 2011 -0500

    Review feedback.

commit 40122a39f0dcfeea55ddb6dc8adc76792918893f
Merge: 0716156 46b90e5
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Jun 27 16:49:33 2011 -0500

    merge with trey

commit 46b90e56fc22586a215ec8f3aed2f2a188a1ecfb
Merge: 84bb553 217c11a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 16:48:03 2011 -0500

    trunk merge, getting fierce..

commit 837141011e0d9f4e058be59d4b8721b6eb80e045
Merge: 531956c 217c11a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 16:08:48 2011 -0400

    Merged trunk.

commit 531956c28ec0cb9157d64230826ac50014391391
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 15:49:24 2011 -0400

    Added nova.version to utils.py

commit 9847045e8a81213b497ace7d29f5d33898ee792f
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

commit 497effd30110871c6cf8429fc6e89888fb64ccee
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 27 13:51:30 2011 -0400

    renaming tests

commit 9b6d511bd48e6b19888830d73609a147ab540ade
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 10:51:05 2011 -0700

    make sure basic filters are setup on instance restart

commit 84bb553094ced3677f7627569a4cad6181b74629
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 27 12:32:57 2011 -0500

    typo

commit 15a25c155a1c1c633fe9c8d05e51fde57ede1d7e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Jun 27 20:36:53 2011 +0400

    changed extension alias to os-floating-ips

commit 6396898fcd05361ae080b76fb9be55a20fbfa30e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:17:37 2011 -0700

    missed the bin line

commit 1080b7fcf6fcb9fbf8e5bb50344c9f3e52fa305f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 27 12:10:47 2011 -0400

    Updating license to ASL 2.0

commit d6cf46f3febbc42790d4adb6c219e54b3fc64068
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:07:49 2011 -0700

    update nova.sh

commit 3bb6138d515f8f621b6a613b32c2f11004f52ad6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:05:05 2011 -0700

    make nova-debug work with new style instances

commit 891b422ed0e6b8e3065bb153a5237ba5bbae0594
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.

commit c7b6c2c5e05f2e82ff4abd37576876f09b793965
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 09:02:22 2011 -0700

    remove extra stuff from clean vlans

commit ab967bfcd4c2b09f7cb2342ecfdb4eecb309edde
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 27 15:54:43 2011 +0000

    Clarify help verbiage

commit 36c52f7bd7b5a7cb2152bc43442bc7b046d856a8
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

commit c800e273dc4b4a7ebb25de18dc26ad3cb8b220b9
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

commit fe5b3a70d769ca0fbfb048092f5a392127dc63d2
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

commit 31f0cb38b34f88ee0d6bf19c8c50e1b70e7918d8
Merge: e5ca6b0 217c11a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 27 15:13:37 2011 +0000

    Merge with trunk

commit c3a38c515e817868170c55d0c20a41bea97dd4e3
Merge: d789488 1708f53
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 27 08:07:02 2011 -0700

    merged blamar's simpler test

commit 6f3b97c93f82cbbd78917c4f015ba5fb2e7aa5a1
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Jun 27 16:03:14 2011 +0100

    Pulled changes, passed the unit tests.

commit 751ae3ec2b0faba904a7392dd4141abc74cf9da0
Merge: bbb79e1 217c11a
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Mon Jun 27 15:22:15 2011 +0100

    Pulled trunk, merged boot from ISO changes.

commit 1708f536f18f68586f6af1c68f296720cc5a1005
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 09:58:17 2011 -0400

    Removed now un-needed fake_connection

commit 5315afda11c451c5211938928305e1f0b3f16754
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 27 09:56:31 2011 -0400

    Use webob to test WSGI app

commit 11c085abdcfcd5cb78b37f480f883b82c5130c6b
Merge: 6e2188e 217c11a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 27 14:42:36 2011 +0100

    Merge trunk

commit 07e96b00d6ef8705a414cac612918ff863d32fe4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Jun 27 17:05:35 2011 +0400

    fixed pep style

commit 6abadbcd989d91d792b5e4a58084ef0c43a82d92
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Jun 27 16:33:01 2011 +0400

    review issues fixed

commit 42e1a7833323a69879fc2099ba105e093bf364d3
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jun 27 20:21:40 2011 +0900

    sqlalchmey/migration: resolved version conflict

commit 0663399c3b9195bebb4f3e37e8847573731e205d
Merge: 99d85fe 217c11a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jun 27 20:20:42 2011 +0900

    merge with trunk

commit 83d7c2adb278c9ea0404397594db10dc96738007
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.

commit bd9bd7bde9cdc81ff0d5f799f4caea887b449842
Merge: 9cc0a4d 217c11a
Author: Lorin Hochstein <lorin@isi.edu>
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 937ab2c0c34c406ff33da6ccc3ded04b0bb7cb0f
Merge: 2de1e9f 217c11a
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 2de1e9f391b2a6faa7f37bd80619920da164d0f2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sun Jun 26 17:32:19 2011 -0400

    adding xml serialization test of zero images

commit d78948825e8a6876711d1d93a5dc223cd701122c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:52:26 2011 -0700

    pep8

commit e6db053af1f70d40dfdd18f7a9472d82b42d84e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:50:39 2011 -0700

    add metadata tests

commit d77c44a089fb4d8a0ec42948bd75b48db5335a2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:47:54 2011 -0700

    add fake connection object to wsgi app

commit 324f2a3afb7af120f0df8ba997e5c580444d247c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 25 17:29:14 2011 -0700

    add support to list security groups

commit c83b2fc930e2bd30dd74acdd1dc751fced2ff08c
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

 run_tests.py |    7 +++----
 run_tests.sh |    7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

commit 217c11a334d9283879e02601886c26b25400a46b
Merge: a7cef03 674036f
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 674036f293ce834a6924d1535aaf15997f12f7db
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Sat Jun 25 14:04:40 2011 +0400

    PEP8 fix

commit 9cc0a4d61e87dcd09ea3b83651a73ad49c33b09a
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Sat Jun 25 00:22:59 2011 -0400

    pep8

commit ff11b95644177b29b67a172902035347760ec10b
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Sat Jun 25 00:05:38 2011 -0400

    Updated _dict_with_extra_specs docstring

commit 9136625204055866d2449f61df4533a568f237f5
Author: Lorin Hochstein <lorin@isi.edu>
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

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 925c3cb585d3a11ce21d481ba909dca4b526ad33
Merge: f2f0ff7 a7cef03
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 23:13:01 2011 -0400

    Merged from trunk

commit a7cef03d2e70d1f334d085cd294c583f595d2bf2
Merge: 1fbe734 13a223f
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 25 02:30:47 2011 +0000

    Add api methods to delete provider firewall rules.

commit 1fbe734419eb43a7061cd9bbb19419a1b98d6dd1
Merge: 27a9989 cdf4e95
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 27a99896842cf7c9e52bf6ce6761e10539069171
Merge: 7f4aa48 2196965
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 7f4aa48b8425e019e568476bdc8de46d14e16972
Merge: ac0b5e2 50cd407
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 ac0b5e2fdba6f9b68b9d264edb52386600bfec07
Merge: 7ac9f45 9cd701c
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 ddc93bde168d2c8f831382236c6319947421ec85
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 afeb51326e407f4179dce88caf2c3a560cc1d44d
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 deletions(-)

commit f05f378503e92abb1495c2eacdc702ed2a43fb0d
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

commit 89f53a82d9077a0b45301b5f55932f4d2f0493ba
Merge: 23183b0 8ab2377
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:13:53 2011 +0400

    merged

commit 23183b099a2672aa0ae33d058fdceec9575bbcb7
Merge: 7a85468 7ac9f45
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:12:54 2011 +0400

    trunk merged. conflicts resolved

commit 8ab2377ffef75941c127c0dda07f476adad1ef4f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 03:05:09 2011 +0400

    added disassociate method to tests

commit 7a85468d6c5cf1ec6bbb68ff217ff2d8089336d3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 03:03:17 2011 +0400

    fixes

 Authors |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 97639839591121970c73708f1243ccabdca1a0f0
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:42:27 2011 +0400

    tests

commit c4c7200f60f0f64f574562bed019406726c0c33c
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 17:19:32 2011 -0500

    PEP8 cleanup.

commit 2214f6533aaf1e5bfe1e0a89fe4dd50fc92d7bee
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 24 17:15:29 2011 -0500

    parenthesis issue in the migration

commit 2e6c432b89aa37d1c747660f30225ecea2dc1648
Merge: ddeacea 250831a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:14:00 2011 +0400

    merge

commit ddeaceafb1d8af8fffbf7716a13f70b09322df67
Merge: 38e831a c5863e5
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 02:12:24 2011 +0400

    some tests and refactoring

commit 823547a9244af7e8b62a230e551f99f6cef320e9
Merge: 82cb943 0df364e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 17:11:44 2011 -0500

    Trunk merge fixes.

commit 0df364e68105a943ff01de76477a2693967756ef
Merge: 82cb943 7ac9f45
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 24 22:08:45 2011 +0000

    Merging trunk

commit 250831aa19e0c2bfef2222b1ba143464c1c25d87
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 01:47:25 2011 +0400

    implement list test

commit 38e831aba52c7cd7e9577c2b40f8c3144d166dda
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Sat Jun 25 00:33:40 2011 +0400

    some tests

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c5863e5b3aee1d72375dd0f67c7ba54c54415e41
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sat Jun 25 00:30:22 2011 +0400

    fix tests for extensions

commit 82cb943bfb34688cda496b456f17017035ab7346
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:18:05 2011 -0500

    Fixed snapshot logic.

commit 26a69785766d9556fddf659ea3385d88d3ee7a02
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:04:34 2011 -0500

    PEP8 cleanup.

commit 5c07a7941220b7163e5cb98e3566343d169fc4f3
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 15:03:01 2011 -0500

    Refactored backup rotate.

commit 4762a1fad409426e0d72a7c424a177f525978443
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 24 23:57:10 2011 +0400

    conflict resolved

commit 2106dc83c8b5725a5a479060eeac260aae4094d4
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 24 23:55:18 2011 +0400

    stub tests

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7dd66b16053989c2ac8602792d4156f096c43d29
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 23:31:21 2011 +0400

    add stubs for flating api os api testing

commit f98b04e2db8794fc4c3a6efa2614eab5394277aa
Merge: ed40928 95336ad
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 21:35:06 2011 +0400

    merge with kirill

commit 95336ad5c77dbf5c284be82e2148be3ad47d02db
Author: Kirill Shileev <kshileev@gmail.com>
Date:   Fri Jun 24 20:59:32 2011 +0400

    associate diassociate untested, first attept to test

commit 19e76cb678eb26ccd0332d91a593e6e1e8faf84d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 11:56:15 2011 -0500

    Pep8 fix

commit 6ea3c8e4ae9c5b150c97b9cfba2fc88d22e20b74
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 11:55:43 2011 -0500

    Adding tests for backup no rotation, invalid image type

commit fb59667ff6babee1b3176944c043f2a5d095c0d4
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.

commit 525f727a34f0b75760d3af189bf40ea0ac646d2b
Author: Arvind Somya asomya@cisco.com <>
Date:   Fri Jun 24 12:15:13 2011 -0400

    Fixing PEP8 compliance issues.

commit 1e48018b8c880f4829926a350b765c750c378f68
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jun 24 10:50:48 2011 -0500

    Trailing whitespace

commit 668068d65faf9a92029c3e916484a1db1b0dc823
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

commit f2f0ff7f16f3d6c2d599328aadaa1a5f44b1bb3f
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 10:52:59 2011 -0400

    Edited the host filter test case for extra specs

commit 0092a490fc00e8dd245dfe1936880ac91632ade0
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 10:37:43 2011 -0400

    Removed an import

commit 4bcd9678fc32c72e2ad7fae0d4d278b378138f38
Merge: 5b064c6 7ac9f45
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 09:54:18 2011 -0400

    Merged from trunk

commit 6c4336d2126d932e32d134708f6df6c6546f69cc
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 16:07:33 2011 +0400

    Remove extra debug line.

commit 0479371dfbb9e158253e870cadfdbba248eebf57
Merge: f6d8f57 7ac9f45
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 16:01:51 2011 +0400

    Merged with trunk

commit 0bb7a90a30dc7f0f3568537dbb08615fab89b3e7
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:55:06 2011 +0400

    Add reconnect test.

commit 3ddfda9f9910b36c93b0d88e40ae84614332b5e3
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:26:15 2011 +0400

    Use simple_bind_s instead of bind_s

commit e029619a412090b5ed6afe83e68619437b14fe1f
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 24 15:20:24 2011 +0400

    Add reconnect on server fail to LDAP driver.

commit 99d85fe2223e5be82d20bc3ae40d78344e8c3807
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jun 24 19:08:26 2011 +0900

    ec2/cloud: typo

commit ff6f57a42f328f2b52ee2776cd440773817ab181
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Jun 24 19:08:26 2011 +0900

    image/s3: typo

commit 737b0ad6f089d9e398f2505c03ff1ed84c33e33e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Jun 24 00:30:58 2011 -0700

    same typo i made before!

commit 82b25b7c8ee0b326feb50e5e52a3eeab21a500f3
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

commit cdddd4b7a5c85a6cd86dac786cc0398514ba17c2
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.

commit d492c98765f12f2995772793a206109b51759aa8
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 23:05:12 2011 -0700

    requested_mem typo

commit 580ecae2a0b39c7da574650e63c89a88416fd6e7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 23:00:15 2011 -0700

    more typos

commit 9d4816687e8a6116615cabd2b10ed0badb434b83
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 22:55:45 2011 -0700

    typo in least cost scheduler

commit f6d8f57e69475ce30d0374bb230e129f394ae66e
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.

commit 07a9594162aa4d71e8473cad61dba88f68dc33a5
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

commit 9e54e8e7a74710cc3f54c9ab9dea842eb31a69cd
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

commit 5b064c6c7aa97757aecd7b8a3fa17b6aa09c74c9
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 01:44:22 2011 -0400

    Dealing with cases where extra_specs wasn't defined

commit c1574de6f19b6c52c0990387832498d31687bf8d
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 01:34:47 2011 -0400

    pep8 fixes

commit affc4333abe9f0797084cbc8cb76960e1448666f
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 01:02:28 2011 -0400

    Renamed from flavor_extra_specs to extra_specs

commit 80c76dd006ddcab7293080226a5c48396e4b1c9b
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 24 01:01:30 2011 -0400

    All tests passing

commit 9b0fd1ff8e58f420c988223e915970ecb2278792
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 21:59:54 2011 -0700

    missed passing an argument to consume_resources

commit 21cfe496cec3df5bb3020828e454b63ca937ed46
Author: Lorin Hochstein <lorin@isi.edu>
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

commit e79e8a4a7085504010d1e2fd7af62cfc1e4be49e
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jun 23 23:42:44 2011 -0400

    Starting to transition instance type extra specs API to an extension API

commit 0b1ef78201d9e6dd086d3c4e97048524d73da99b
Author: Lorin Hochstein <lorin@isi.edu>
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.

commit e7189648b65eab2edc6a796b5f3c0f1de8033181
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 22:21:10 2011 -0400

    pep8

commit d18b87145cd0b922ab57d33981092eaa99db7508
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 23 21:31:00 2011 -0400

    Created Bootstrapper to handle Nova bootstrapping logic.

commit 9f7da0feaeb4f71ba963c7a0997cdd8da886c965
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:56:31 2011 -0500

    alter test, alter some debug statements

commit a5d71a9415bcfed909e9fbb2bd53ce780df5cee4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:44:25 2011 -0500

    altered some tests

commit 614a2286c51c65a40f1f0d5d9db254521d54b7f4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:13:39 2011 -0500

    freakin migration numbering

commit 1c58a226601fd2ad9c6f08df46cedf646324b94d
Merge: 785c8b0 7ac9f45
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 23 18:10:30 2011 -0500

    trunk merge

commit fa40bd99f1193fb55095dea1b5437f35717738e5
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Jun 23 15:57:57 2011 -0700

    removing erroneous block, must've been a copy and paste fat finger

commit 49eb14ebf004e8aed0e5fd16e5b40ce9b3d242fb
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Jun 23 15:42:57 2011 -0700

    specify keyword, or direct_api proxy method blows up

commit 785c8b06e051e977bc2d8313590e0b97d469250a
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

commit 344a472d96f2d37563494dd7967398fd7e08d0f5
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:54:28 2011 -0500

    Fixed syntax errors.

commit 7ac9f453a660cfd52e96b0907fadd9cbf47719a8
Merge: 0e4ca0c 368bbf9
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 0e4ca0cf254fced03e0fddb3e18831e5d201e48f
Merge: 1cabe63 1e92522
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 20a68268d8a12a82b640af704ee534ef28449e04
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:28:59 2011 -0500

    Cast rotation to int.

commit 71d74b763a775e52caf281d688f8ac857487716a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:19:08 2011 -0500

    PEP8 cleanup.

commit 01b9878aad83499cf04abf691e2a7779a50e9cf1
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 16:17:54 2011 -0500

    Fixed filter property and added logging.

commit 64d2614397a6977bf2121b46a773411f6183437e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 16:55:45 2011 -0400

    added tests

commit ed40928187ca1c963c4aff5353357058a72bd9d2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jun 24 00:39:37 2011 +0400

    Implemented view and added tests

commit 3edc2a70af193e4a55027a6e8734722983d5e4d9
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jun 23 15:35:26 2011 -0500

    Adding missing import.

commit 900d674ec8c6f0e1736245ad361d81dfabbf5421
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu Jun 23 16:10:26 2011 -0400

    Fixed issue with zero flavors returning HTTP 500

commit 1cabe63fe3a103eea5d4953e4aa16db642b63c42
Merge: 2a60235 ef11760
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 e7919087fd40db8609ce9f6bd594e7314721b753
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 15:48:49 2011 -0400

    fixing 500 error on v1.0 images xml

commit e149fa25b13d6427451d91dab09b44aba4391aba
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 23 14:27:13 2011 -0500

    Small refactoring around getting params

commit 13a223ffb336d14efef5e15f3acd248305c7e40d
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:52:58 2011 -0400

    libvirt test for deleting provider firewall rules.

commit 4e9681cf5a13e22557a36a3d2fb48b575f31c315
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.

commit 53e2a9cc300257db52ba2e64a08e9cd8fd3d2b8d
Merge: 4c1a12b aea696d
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:34:42 2011 -0400

    Merge provider-fw-rules-list.

commit f97dddcaf5877f4152ffa1a63fabbce132002809
Merge: b82be44 2a60235
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Jun 23 11:32:27 2011 -0700

    merge from trunk

commit b82be447f6adfda732bb444b4d62d919a26f1582
Author: John Tran <jtran@attinteractive.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

commit aea696d5cbd22cebfdad78008edd7b093b7f30a2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:16:11 2011 -0400

    Make sure there are actually rules to test against.

commit 6c187e384558b6de51a5f56201ade64a66c66138
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:13:27 2011 -0400

    Add test for listing provider firewall rules.

commit 5341b8bff147c3dc52d2046580e73ed391a55eae
Merge: 16f88e1 368bbf9
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 14:07:00 2011 -0400

    Merge provider-fw-rules.

commit 368bbf9d7ed81ef1314c4279c262aa25959f9fd5
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:59:26 2011 -0400

    pep8: remove newline at end of file.

commit 3cdc63d30be118231aff464cf9f2a92e5d28d7b9
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.

commit e609103031cd61e2019bf6553124646465f5cf99
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:28:13 2011 -0400

    Move migration to newer version.

commit 88f2a15b0f67ddf025519c01d4c9fad81f74d1af
Merge: 01f1910 2a60235
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jun 23 13:01:18 2011 -0400

    Merge Trunk.

commit 221e0339a088f3cc3172dfde0a4af7d4995a8e2f
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

commit 0173c55ae181a1e27e8a62099f63f33696e68649
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 12:41:57 2011 -0400

    fixing 500 on None metadata value

commit 074d0f0b3f62594cecddec2db9dd5c6e71e0fc7b
Merge: 65f408c a8e39ef
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 23 12:36:36 2011 -0400

    proper xml serialization for images

commit 2a60235cf8efcc7f33d4d702b878d1462ecfb9c5
Merge: a8e39ef 44378f4
Author: John Tran <jtran@attinteractive.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 65f408cfcf73f15f774da068ec6453f7e8582064
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

commit a8e39ef034f68f0b27eabe8ed51acd47d7e4fc49
Merge: 1e8a176 bedffc8
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 a4e7d643260b1a1c2fab76b1e3bb56019acaffb7
Merge: 6a9c533 1e8a176
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 23 07:22:22 2011 -0700

    trunk merge and migration bump

commit c2ad0694ab6207ca8ea11d472fd41dbf27042c9e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:15:20 2011 -0700

    handle errors for listing an instance by IP address

commit 9063e97a24c32c0196699dec3c35b14e47a9a72c
Merge: a5ce909 43c408c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 23 10:06:44 2011 -0400

    Merged markwash's fixes.

commit 300b6d85362659c7fc9ad2a848db4ae39a76d6fa
Merge: 03b87b4 ad24212
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:03:42 2011 -0700

    Merged list-zone-recurse

commit ad242125cb64b8fb2bb1150a602e17a232c1c9c9
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 07:02:49 2011 -0700

    str_GET is a property

commit 6e2188e00174525f935a3412b2fe42fdc3b05f47
Merge: ef38cfa 1e8a176
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jun 23 15:01:57 2011 +0100

    Merge trunk

commit ef38cfa2ce7e6eb6bef4e26f2a6242109afa5153
Merge: 6aaba08 8e553dd
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jun 23 15:00:59 2011 +0100

    Merge trunk
    Addressing Sandy's comments

commit 50cd407e6e6e4df6743aa0b048b283d8b82c9ccd
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jun 23 09:57:22 2011 -0400

    Fixed typo

commit e08b41fd61da2855aa3a604447713f87d97ceb2d
Merge: bef4353 1e8a176
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Jun 23 09:54:54 2011 -0400

    Merge trunk:

commit 03b87b40b3c4b93ad8c3d6438baad170695e23ac
Merge: dc28f9f 1e8a176
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 06:53:21 2011 -0700

    Merged trunk

commit dc28f9f5fb0287ee95f4dde561ecf9ef99804783
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 06:52:19 2011 -0700

    minor fixups

commit 8d6b0652adc871acd306de7f844956e8d7db93a8
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

commit 5e3cbf52e078ad2c00d9ed6965c9df000dd47d80
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Jun 23 05:35:04 2011 -0700

    typo

commit 95d0efcac6836b8b18393696e010532a93f3ae6b
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

commit a1dbaf3094097a629da15e08efd0371117305902
Merge: 52fb940 1e8a176
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Jun 23 13:38:42 2011 +0200

    Merge trunk

commit 52fb9404d8ce529f6e852c800f05a9615dc8474d
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

commit da9619b3fcf583062c35a8b6a5b84d05d07f690d
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()
    ,

commit 50e4293e5b58e1df2a175384dba1c124373d822f
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()

commit f05892e31c7bb32783150904daf6fbed1d489747
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()

commit b1b21e9e5e46bf0972359fe2bfc4adb0790100a7
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()

commit 3e4d3884a3c3f045a0de211f14e3f241ef9deb1a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 23 19:51:00 2011 +0900

    ec2utils: an unit test for mapping_prepend_dev()

commit 32b86bb262f17b9347c587ca4ec46c204f5bca0d
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.

commit 2efa7eb08f1ffa3fd730f81056b0ea95a46cf118
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

commit cab8fb13211ca02e14ea2a578792fee2d490da6c
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()

commit 06a158aed2c4c8f0bded6bfe1588d3fad2095e2a
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.

commit dd1c20251fc70e5ee5447ae0dbcfb5f5b165af11
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 23:38:58 2011 -0400

    Returned code to original location

commit 3c7040420767f6a379c4ccbf15c53988cb36cea0
Merge: 795026e 1e8a176
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 23:34:56 2011 -0400

    Merged from trunk

commit 43c408c017019d20a2bd52e572300e307bbfbcb3
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

commit 795026e9838175caae72feff196a64aebd328f7d
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 23:14:39 2011 -0400

    Now passing unit tests

commit c0bf8c4de34ea90d59f90704b1ec64c43a6a19e8
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 23:01:41 2011 -0400

    Two tests passing

commit a42399d62839a80531f320a5ebdcd15b6df414dc
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 22:52:42 2011 -0400

    Now stubbing nova.db instead of nova.db.api

commit 9f95c67d31fc87b4d2ea03d5db9d886507c8668a
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 22:43:44 2011 -0400

    Bug fixing

commit 9a3e641bfcdbc6e77bef322d8bbcef10e86cd6ff
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 22:40:00 2011 -0400

    Added flavor extra specs controller

commit b1a3b20139739a7d40019dc377ff31bd28b92a5d
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 22 22:22:56 2011 -0400

    Initial unit test (failing)

commit 1e8a176e670031b610609d8b8033e06528bc23e1
Merge: e3ae297 50800a1
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 8965f24e95656b8e7fdfc5e3e96bf343e853284f
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 23 04:28:42 2011 +0400

    allocate and release implementation

commit 50800a196d3d7d22e525d2ef44afb2cab06891d4
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:27:17 2011 -0400

    fixed pep8 issues

commit d9a3c15eaad144f1370f93175a8dddcde3bcae63
Merge: bfa7f64 e3ae297
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:04:48 2011 -0400

    merge from trunk

commit bfa7f645902eb5b0339e05d1be5a884d95b9cae6
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 20:03:35 2011 -0400

    image -> instance in comment

commit bf3aa271de9c48670225c6541d1da93dfe1f50e0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 17:45:07 2011 -0500

    added virtual_interface_update method

commit e3ae2977b6da868ed030f7aa8c221f8cbb49474f
Merge: 8e553dd 91bd8c9
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 1f60fb54dedb46039b52465d8c22340cf6036e94
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

commit bedffc8ad43d9de333391f424f49e0726b12a59c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 18:22:57 2011 -0400

    pep8 fixes

commit 832874bc4d4554fb64d17b786dfadaddc2abf819
Merge: 03b9769 8e553dd
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 18:12:53 2011 -0400

    merging trunk

commit e4394e5ffb5ed0c327ae20db19d2770cdb9e81b6
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

commit 3cdb3cf765bc8286ebc8a1454aed0284ca5aade5
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

commit 03b9769c70bba5dfd7894f744b0a17dc7a58f4a1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 17:14:58 2011 -0400

    reverting non-xml changes

commit 35b919640ec2ca800f55df0e0ed368c5d521e0d8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 22 16:14:01 2011 -0500

    Adding backup rotation

commit ef117608e365ca17bd19a20acd152568837320b0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 22 17:07:26 2011 -0400

    moving image show/update into 'meta' container

commit 358edc9d0aed69240e3ebc3097c9f4f6cceda51b
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

commit 72181abced8cf613d1bc041de43a5a75f9172957
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:41:27 2011 -0500

    updated libvirt tests network_info to be correct

commit 98c9f886b807e0b85bacc42f433c4a50031e0c98
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:35:25 2011 -0500

    fixed error

commit bf2e8b8a62df382e08686671dc7f5cc930188606
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:23:29 2011 -0500

    skipping more ec2 tests

commit 76d8d6df91aa64eea226e8427243ef719c2dbe64
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 15:10:02 2011 -0500

    skipping more ec2 tests

commit b17a1978de648f33ec99f0016450d46bd50b00db
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 14:59:41 2011 -0500

    skipping more ec2 tests

commit 5545a46a464d1d590c699d3827965c68a1034ef1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 22 14:52:46 2011 -0500

    skipping test_run_with_snapshot

commit ef9e4b9df24fd5e5ae5e33e8e7d2eeff82ec3221
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

commit 91bd8c99d484010d45532c58db3f29960e036718
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 22 15:22:25 2011 -0400

    fixed incorrect exception

commit 9cd701c4326f9dc2f7b01b39cf0825068fb946e0
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

commit c9e1636edbd4d4ae84a253e644197cd7261a1f21
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 22 13:31:28 2011 -0500

    Round 1 of backup with rotation.

commit a7e080c0ba228dd1e398a8a3f4526b90d274f2f3
Merge: 128252a 8e553dd
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 22 10:47:51 2011 -0400

    merge from trunk

commit 623133229ae0a0ac86123e9090220b6443a17b19
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Jun 22 09:33:46 2011 -0400

    fix some issues with flags and logging

commit 08ac3e6711dc881486d5b971fe72dc765772a4aa
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

commit 18186f75a359a022ecd8c049537ddfa1151c6015
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.

commit fde456323809646f7e7c8344cba842cf56301464
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

commit 882465bff13b3685d3ce3e0fa18d11b167a8db8c
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

commit 024b57552984ea6b0c7d288c1aa866580441d441
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

commit 39140b1eef4efde5611c7c85b59f98a8015f4630
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.

commit 13790cf6a7ccebb18f4e55cbd34548c4cf2bf1ce
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

commit d3bc978b483cd9a2cedf0184b69984a1d4e594d6
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.

commit 61cdf49768f4b7fe9496ca1f0315c9766be0968a
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

commit 0fa1a7adb2438af3f970241e59839437d5bafefd
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()

commit 5c4ec72bf06187af35b07552a5a70ec3be619717
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()

commit bf4303f80d87f1befc6daed3688c86a1861b3dba
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:54:22 2011 +0900

    api/ec2: make CreateImage pass unit tests

commit 406510a3727b110e77a51f04a968c3bb16a18d75
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.

commit f149b75fb5aef0241f3d30aa1267a895cc588467
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.

commit 0e90b0a8830719eb7345d49dff6b0f7e619e5d96
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.

commit cdc0994bf24f839a299807ab329b8e957e892f99
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:40:06 2011 +0900

    db/migration: resolve version conflict

commit a7f4a55ca085cec98a9a36c809e0e9ab7fbc81fc
Merge: 0fee0b6 8e553dd
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 22 12:39:43 2011 +0900

    merge with trunk

commit ba578513995c5e04a902856f1567572124e3f8df
Author: John Tran <jtran@attinteractive.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.

commit 6a9c53359c17739e69df098823ac83c8426f0219
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:19:44 2011 -0700

    pip-requires

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2087800e3eba018f9bff92ce109e138bcb31d4f2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:19:01 2011 -0700

    pep8

commit 944180a291a7820b542245a8b0e310e1da974459
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 12:11:16 2011 -0700

    fixed zone update

commit 8e553dd1075fd186cb3a8af37d01d3e75ca8503c
Merge: 827c034 0edc58d
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 906e24be016e2dcce0550f6edc712c5f5372ef19
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 21 11:20:06 2011 -0700

    fixed local db create

commit 2ad06b58b92099d128aee785536adea7c386e1d0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 12:03:01 2011 -0500

    omg stop making new migrations...

commit 7904d6ba02d5c069b9c8d2a00ca10d9135912950
Merge: 86179ed 827c034
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:59:22 2011 -0500

    trunk merge

commit e5ca6b055019d2742d15f3bb0079990e6a44eabc
Merge: d63c8cd 827c034
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 21 16:57:32 2011 +0000

    Merge with trunk

commit 128252a2f48991b0343fa204f67fb695ca8998e1
Merge: 6ca19c2 827c034
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jun 21 12:57:21 2011 -0400

    merge from trunk

commit 86179ed5fc1d893a21ec72fa8da9c65cdd837d31
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

commit 827c034b7582f7e5cade2879a27b9c40761dfb87
Merge: c15bb43 5b73538
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 e6baddb96e3391b56f9baa09a510428122a54be3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 21 11:41:53 2011 -0500

    renamed migrations again

commit 6ca19c2abccbe2788237b63774e6c0bc49a8137f
Merge: 3695041 c15bb43
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue Jun 21 12:33:40 2011 -0400

    merge from trunk

commit 3695041bc36bfdf81fa026a85e1f888d012cd3fa
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)

commit e0bb937e7ad1f1d120160d3a114bbbc4f0fc3e74
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

commit a5ce9098b491de0b2ba58dd3c1ad78b3f8ac0160
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 12:03:27 2011 -0400

    Removed whitespace.

commit 0bb98b54931a36a3f2f5d622db22ba39ed0fe03e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 11:50:28 2011 -0400

    Fixed objectstore test.

commit 07161560b4e04c2451c63ae3b2dd1956221e6a57
Merge: 2754370 54296fa
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 21 10:26:56 2011 -0500

    merge with trey

commit dec4d95ee063f737889cff15f349f9653836cc5d
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.

commit 0edc58d0ba97e3a20d7bc4b2df3d86aa30f647cc
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 files changed, 1 insertions(+), 1 deletions(-)

commit ff4fb8e21d1b619edc671386d52846140077ca9c
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.

commit 2031e4d55402ce56c77b23e717d26ad3fed929e3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 09:57:40 2011 -0400

    pep8 fix

commit fe6a995b5d4948811daf2366f4e24fd7c41de04c
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.

commit f61987c9fbe6d61d7a685c0043d6fca1e101816e
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue Jun 21 16:55:45 2011 +0400

    Filter out datetime fields from instance_type

commit 0acf643b446a80e7f322eda7c275577b4efcaa71
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Jun 21 21:10:08 2011 +0900

    erase unnecessary TODO: statement

commit 69abdda8348864ef2bed2a2d88cc10a8f75ab618
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

commit cdf4e958c1e9db371b9693592e75e4ffb18cb5a2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 21 11:39:55 2011 +0100

    fix comment line

commit 65c72822103de6c07729edea876c1b3b0d2b28cb
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.

commit ca30d0a8bfef60dfd2c118534593e7570920aee8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:54:14 2011 -0400

    log -> logging to keep with convention

commit b114dc2adad406981fcc92976a8bce1df1cecc16
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.

commit a4d6f2a4bae454d7f300d2bba47b44b110b2f56a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:32:31 2011 -0400

    Removed unneeded import.

commit bcc72567fe2b3498c899cd7c573ebf68b60b1d85
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 21 00:21:33 2011 -0400

    Tests for WSGI/Launcher

commit 2196965471e3558c28c68fba5dfc5a5dfa7b79a1
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.

commit b1413671b67f407e4e8bffb5e5d46c5fde1e8088
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 17:21:22 2011 -0700

    trunk merge

commit 3e768d27e9a766129bb5faf5ecc3251abd1a95c1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 16:56:59 2011 -0700

    fix lp 798361

commit 50eda9e0e2d66163078a287fb28d51ba0326355b
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.

commit 44378f49cc96ceb564ffe951a41395a6b502496e
Author: John Tran <jtran@attinteractive.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

commit 51a979644a61f98c56ca8a336378fb74bf28c897
Merge: 1686460 d63c8cd
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 21:53:01 2011 +0000

    Merge with parent

commit d63c8cd0dcb254a8761033e48b8657029b97f22c
Merge: 2b16892 5b73538
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 21:31:35 2011 +0000

    Merge with parent

commit 5b7353806f740d6f6243e95ee72ea60d319dc9cf
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

commit eddea4e8c02dabdc7ed0657a0a1321ce0d6548cb
Merge: 7062a4c c15bb43
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 20:55:16 2011 +0000

    Merge with trunk

commit fdf22d0de21b08abc2cee151202d4adc1314c2a4
Merge: f32ef3d c15bb43
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 14:55:29 2011 -0400

    Merged trunk.

commit f32ef3d42485c76310b8fc8c8510d69fc41399ea
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 14:54:53 2011 -0400

    pep8 fixes

commit 7062a4c25b91796fb9ae5e1c3577197b0b225f8e
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 20 18:42:04 2011 +0000

    assert_ -> assertTrue since assert_ is deprecated

commit 42839be522f76d17318adcbbb5906c6fa61f94ac
Merge: b178358 c15bb43
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 11:19:01 2011 -0700

    added adjust child zone test

commit b1783585e17dc67467b9252df62e0821f851409d
Merge: 88613c1 cf79251
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 10:22:53 2011 -0700

    tests working again

commit 54296fa8e3c96d3cdd7d0c131621c8a3f112a093
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

commit bf3271e28f41dd75e6c1f1936f294d12666fcbe7
Merge: 84e3070 c15bb43
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:36:13 2011 -0500

    more trunks

commit 84e30708369912da992a3e43f49775ea582ccd30
Merge: 3e5cb68 cf79251
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:23:49 2011 -0500

    another trunk merge

commit c15bb43fae5790d761110752b5a7d1aebaf42b27
Merge: cf79251 3917257
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 3e5cb685d301a83be61f88a8111a1ef7f96ed2e6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Jun 20 11:10:16 2011 -0500

    importing sqlalchemy IntegrityError

commit 3917257e00292f4077b1e72534bffc207a870f94
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 20 15:15:49 2011 +0000

    Moving add_uuid migration to 025

commit 422bc735095066f7895a7cb77ab99b526f823416
Merge: 4a0812f cf79251
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jun 20 14:58:00 2011 +0000

    Merging trunk, fixing conflicts

commit c540fc51fd5b26686e24d6a517e733c4a2af7391
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

commit 88613c1e6bc451ed8fb2aa67852e15e03ab91d63
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 20 07:45:21 2011 -0700

    working commit

commit d8f2dfc59dcd11fae36bdac6e895889200913072
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 10:39:17 2011 -0400

    Fix objectstore test.

commit 03fc40c3cf05205dd46b3486d2d39f0500243bcb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 10:12:43 2011 -0400

    Cleanup and addition of tests for WSGI server.

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 48e04ab82c9ced87d0d4d8ceaec81990fcb1f216
Merge: e91287e cf79251
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 20 08:43:29 2011 -0400

    Merged trunk.

commit cf79251a5d8f05bff9e7067ca8acb48362b1a294
Merge: 790ea32 d140959
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 e91287e872006371614667d759eb8f36b54a2031
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 21:29:43 2011 -0400

    No, really. Added tests for WSGI loader.

commit 4cdeac2fc985cbb8fa7b7d797d71f1a753e430bf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 21:28:51 2011 -0400

    Added tests for WSGI loader.

commit 18751e6ce8bbb9046c898c4e45ca38b96169ec27
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 09:43:34 2011 +0900

    nova.virt.libvirt.connection._live_migration is changed

commit 8846b936bfd3564d04fa71caa904fee0ea6fe502
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 20:26:47 2011 -0400

    Cleanup.

commit c557483de501268c6c5e914d72277654ae1736e7
Merge: 537162c 790ea32
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 09:20:00 2011 +0900

    merged rev trunk 1198

commit 02769e5742f964c0057d9547b780a2d6987e9dbc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 20:18:29 2011 -0400

    Introduced Loader concept, for paste decouple.

commit 537162c3fdf42b94561eeef7ead5b4f96597e084
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 08:51:25 2011 +0900

    fix pep8 check

commit c9a87f3b275ea572bc838a6a0a59d21680a0739f
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jun 20 08:32:34 2011 +0900

    fix comments at nova.virt.libvirt.connection

commit 1044ad9cb5f62b52d89350625138e20497f92a04
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 18:00:38 2011 -0400

    Cleanup of the cleanup.

 setup.cfg |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit a940207369c9614689b50a98fe964d272a7eba69
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 16:27:46 2011 -0400

    Further nova-api cleanup.

commit 940b3e0a445c8409938681ff8c31cd7b2bf03dd5
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.

 setup.cfg |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 5ae2914c1c60259643045af3b54eb9998517ab38
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sun Jun 19 14:09:09 2011 -0400

    Removed debugging, made objectstore tests pass again.

commit 200e932a1ad88e2836d59e3e93642de2f929c53e
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.

commit 4a0812f404a007f0f161794939bb700d7538690e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jun 18 00:12:44 2011 +0000

    Adding tests for is_uuid_like

commit aa7b67c4f4cbd49303b138d2e499d9e630a74b38
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 23:53:30 2011 +0000

    Using proper UUID format for uuids

commit 790ea32b55ab0cc1322e2814fe391bbd5f41d2b3
Merge: 1c6e60c 2f2a214
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 5999d2acababeb0d1a6dcdb2b2028d0418b3f017
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 18:38:35 2011 -0500

    updated fixed ip and floating ip exceptions

commit 2f2a21458c288aac022599ddb0bef12a19a28aa9
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jun 18 08:34:20 2011 +0900

    pep8: white space/blank lines

commit a7b9150d80b1557851cfb66df7488f84f5b0286b
Merge: e4d7eae 1c6e60c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 22:06:48 2011 +0000

    Merging trunk

commit 07d4cea24240137c40e2f71d35b466a3c8ef9249
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 16:54:08 2011 -0500

    renamed VirtualInterface exception and extend NovaException

commit d140959eeb8a3b0e13f0edb79246fe1bcf369d0a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 17:40:48 2011 -0400

    moving instance existance logic down to api layer

commit 9fe63adc7d31f404d87c2713f826db7b62d6e1ca
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 21:03:12 2011 +0000

    Ensure os_type and architecture get set correctly

commit 1c6e60c98202f483873cd04130e2d2e624b50ecd
Merge: 6d59c7f 11d13dd
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 6d59c7f4afc09443b97ae8a657fbf4b75a424848
Merge: 1c27aad bfe6dc2
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 1c27aad504f506d344df75f4c934e09e084bcfc8
Merge: 94216e4 abc8957
Author: Lorin Hochstein <lorin@isi.edu>
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 ae9673bdcb6bb0295c929ede649dd10354ba1ff5
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

commit 11d13dd104bb780bd4acac3f205dd55932e69a58
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 17 22:32:17 2011 +0200

    Fix PEP8

commit 8dac730c085fa85ac7660a30dd4a40f78d091c7a
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.

commit 7ab2d3433295640c37670b43a805dc818b0952ec
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 17 18:47:57 2011 +0000

    Add new architecture attribute along with os_type

commit 52bc36fbe2374e3c6a245d33050d0af31edbd48f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 17 13:47:28 2011 -0500

    bunch of docstring changes

commit 1e92522ff4b6aab8d4435b9bb5c5a1a2c5e3754e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 14:35:10 2011 -0400

    adding check for serverRef hostname matching app url

commit 6646dfc5123ec5eeffa234785d3bcd166ffb25f0
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 94216e46e91f54ff2a252109734aee09a6a4845a
Merge: 4a63035 54f677d
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 4a63035b56af327a3516ed48f6946561125c86ed
Merge: cb7287a 23450ec
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 2777785cae7c3dda1eb90f26bb3f2927780706f6
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

commit 23450ec73e6592bebde1d4cb965fdc9a267a1ce4
Author: matt.dietz@rackspace.com <>
Date:   Fri Jun 17 12:33:18 2011 -0500

    Missed a pep8 fix

commit bfe6dc2d69824314628c352e4d297ef976d738c4
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()

commit cb7287a21ac275736e00180d8b918df489efd8e9
Merge: d36255f 8ccfe30
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 17:32:48 2011 +0000

    Removes nova/image/local.py (LocalImageService)

commit fa48feacf44de3ac08a5bd54c2c1d1807878d367
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

commit d36255f1b6c31df8c6002f2eb763ecca681697aa
Merge: d9dd7f5 5f50377
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 8ccfe3059c182c8799a58e9bac0169a1dc323df2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 13:15:49 2011 -0400

    fixing test case

commit d9dd7f564a3fff08df2fb79c07bc13edf7f6efc9
Merge: 26e3d52 6c11323
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 c93021d08d192667bc12cca0bdebefc57d772c1f
Merge: 1ceab6b 26e3d52
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 17 13:12:13 2011 -0400

    merging trunk

commit 2754370fcf914f0ee9c22eec836e1ac4f62d94ec
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 17 11:49:20 2011 -0500

    more words

commit 6c113235a3ea06daff90dffe21741da39366d17b
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

commit 73ed8c0e4c5050d3eda785b6cc42127d3739c05e
Merge: e763002 d724585
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Jun 17 15:54:25 2011 +0000

    Pull-up from trunk

commit e763002a1e30fbe5535fdc1c8e7ecda36e8ffe67
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

commit 26e3d529d70961330251927a183b745692ae1dfe
Merge: d724585 7599b25
Author: Dan Prince <dan.prince@rackspace.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 e9368ee10653844f073c0cee558ab05f9463b880
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 17 10:46:14 2011 -0500

    add vlan diagram and some text

commit bc9c218cd4117c94068d4baea468749c7e7ae299
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Fri Jun 17 09:25:23 2011 -0600

    Added context = context.elevated() to get_all_across_zones

commit 39e51d69558cefb2d61f4e529397f887617e1b51
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

commit e4d7eaef5c0e17107735fd6c2683f81105d58eea
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jun 17 14:48:58 2011 +0000

    Fixed migration per review feedback.

commit db21b60ed972d0824f66b8f1134cb3954007f5f8
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.

commit abc895700d5f34acc80a2ec5fed93274146ba829
Author: Lorin Hochstein <lorin@isi.edu>
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 files changed, 6 insertions(+), 0 deletions(-)

commit c14071fb780a0c7a1db332469c23642f289609f1
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jun 17 17:27:06 2011 +0400

    stub api methods

commit 9929f1397cb9ecfadb8e7dcd75a97d16c45ce26a
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri Jun 17 09:19:55 2011 -0400

    Missed a InstanceTypeMetadata -> InstanceTypeExtraSpecs rename in register_models

commit 4b69595c9f891feaef9821b965cd454c12c69271
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

commit d72458534c14b1edb9e497512e922bcd3e8fe403
Merge: 7f5a44f b1e2c32
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 7a455bb85973e5f6825c8b1a61d93b87d5775977
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

commit 32ede2ef16954a5106452cfead64c198db9031d3
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 22:30:56 2011 +0000

    Remove debugging statement

commit 53449f10c898bb724bf89882baf2b465130976c9
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()

commit b1e2c32cd82fe98445d3f0f0c5790d9470ae4726
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 21:21:01 2011 +0000

    Glance host defaults to  rather than localhost

commit 0f8b43c5009d15409c92b7d24701fe1c4893420d
Merge: 436a7b0 7f5a44f
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jun 16 16:48:20 2011 -0400

    Upstream merge

commit d64c5f6911b51295b4c40a8ae2b0d0ac76ce84b5
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 15:36:29 2011 -0500

    add in dhcp drawing

commit 436a7b0866191307d740f766a6c874e4a5ee7d63
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jun 16 16:33:29 2011 -0400

    Rename: intance_type_metadata -> instance_type_extra_specs

commit 62b8b9346213a40f2a6cea1da3d06aa75c53b292
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

commit 7f5a44f86debd22c284c485a89c8a9b444902e33
Merge: 782e236 7581af4
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Thu Jun 16 20:06:56 2011 +0000

    Fixes a bug where a unit test sometimes fails due to a race condition.

commit 08ea38443c5915b00c138143afc75ea23f7ec512
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:57:22 2011 -0500

    remove the network-host fromt he flat diagram

commit 2a3b9a699cfd98f5e7fea0d707ea2ecb4f1de337
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:44:57 2011 -0500

    add multinic diagram

commit 64fef59c8c101fb12f48c588f692868b7b4f1f9c
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 14:44:17 2011 -0500

    add the actual image

commit 1d257b51fa5f1804f0f74769d7c1d9caeac58199
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 14:42:50 2011 -0500

    Renaming to _build_instance_get

commit 317c1aa7e33785686b8e62717a20a9d3cc6bf051
Merge: 86fd952 782e236
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 16 14:03:40 2011 -0500

    merged trunk

commit 86fd95261aa258caf9734eeefa6438e48044f61f
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

commit c12a2fba2e0fca538c6b86f65f58a868dc205286
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

commit 75f6d5a7fafab59d97780f83d98ed24b56f8a878
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 16 13:45:55 2011 -0500

    Unit tests pass again

commit 451f3b1519314c8f01193a33ecb1e4dd234c158c
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)

commit 3bfb7c55e1f1c05e79e852c6d5e699f5d2444420
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 18:38:40 2011 +0000

    Fix copyright date

commit 14172b6a0237b0d1cdccf84eb26abe4111ef5c9d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:52:34 2011 +0000

    PEP8 cleanup.

commit 434cbbcba5ccaf9950d0aad4f961aa717d92eb11
Author: matt.dietz@rackspace.com <>
Date:   Thu Jun 16 12:50:55 2011 -0500

    Attempting to retrieve the correct VDI for snapshotting

commit b1d9cd4ddf05296d6a5b4120f513f32b9f2c3519
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:46:13 2011 +0000

    Fixing another test

commit ff7dee4652640f25d27e45aecee2ff96424ae975
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 17:27:36 2011 +0000

    Fixing test_servers_by_uuid

commit 91274ce90a16068a826aeedce6b2cb054bd19001
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 16 20:31:09 2011 +0400

    floating_ips extension is loading to api now

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 43261cfe4c1db09886682ccda1a4d7d5c111c2e1
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 11:27:01 2011 -0500

    initial commit of multinic doc

commit a3a184f5ab9c867f329503751175d6b492a05743
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 16 11:07:36 2011 -0500

    generated files should not be in source control

commit 0fa71e1460fe33db5124c3eabc1752722d029751
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 16:06:05 2011 +0000

    Fixed UUID migration

commit 88adecc00020d238725228db623c32395af90b4e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 16:03:04 2011 +0000

    Added UUID migration

commit 154a9019b50f1fb8720eea956adce9541e83b3be
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 16 15:56:06 2011 +0000

    Clean up docstrings to match HACKING

commit 5e998361bc840b0d46be1c2e3b071ce0fb277792
Merge: 6a267a0 932d944
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jun 16 10:54:59 2011 -0500

    merge with trey

commit 6e9045377e9476c2c4824c0b5adf523433fe88b5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 16 15:02:18 2011 +0000

    Small tweaks

commit e2f1069d7bc9237b3b5c559125fd4a63bc86b5a8
Merge: aa08e2a 2c6477b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Jun 16 17:46:39 2011 +0400

    Merged reldan changes

commit 2c6477bf2ec2ad4726bddda03b9a672223ae0ef4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Jun 16 17:37:45 2011 +0400

    First implementation of FloatingIpController

commit 0ccf84a0c0e189ca69e8abf9daf76544d7e024bf
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Jun 16 17:30:36 2011 +0400

    First implementation of FloatingIpController

commit 0fee0b6b57e6f1317987de3ddd51a21d879d90aa
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

commit 7c345cba56c77d75572166b9535f84537e33844f
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 22:17:54 2011 +0900

    ec2/cloud.py: fix mismerge

commit 69923194f81f5c8e9dc6e6f48c0bf75239c15923
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:44:50 2011 +0900

    fix conflict with rebasing.

commit 1418e05ab1b2b99a682789e413482bfe60f4fee6
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 21:25:57 2011 +0900

    api/ec2: support CreateImage

commit aa56457e07719af92e4d59c36743ad84e5eebe46
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.

commit bb7820fc441923fb6da6e8cf013b51514da3c5e3
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.

commit 1094fb74afacddef90f6098d4385ecc7478419ef
Merge: 524d080 6421570
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 64215705082d8431042c06bf083fce439b20c06d
Merge: b22427b 41c3ba2
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 524d080c32591fc01756004e92fe6a0d4a6196a0
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'

commit 41c3ba283c482a2e673ebf05b9f854bd0c7648ad
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.

commit 365bcc34c1c054c729a59d9e20fb99a019be631a
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.

commit 782e236318f48e5e6792ecd28cae9c9cabeb813d
Merge: b250ca9 79bec55
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 b250ca96dbd31d764994aa67dbeecc389e221d7d
Merge: aa08e2a 813553c
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 1686460397ef81613233337b2929ed109fff9ee4
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

commit 9f8a106086fba0de3d8d867fb3a2d419c162598f
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

commit 932d944997722a4e7aeb5cdfa9e33a5d3e7ddc1e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 17:36:07 2011 -0500

    removed commented out shim on Instance class

commit 2b168925676bd2a70d879b5edb3498c722ab13f2
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

commit 98e0acbc5c847e38eec72fcedbf42d2619f2abda
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 22:18:54 2011 +0000

    Split patch off to new branch instead

commit de49d8e35e05d4442b637848be63139c474ece66
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 21:50:40 2011 +0000

    Add --fixes

commit f470b9cd0cdd85630807c48584aea9605db75be9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 21:50:36 2011 +0000

    First attempt to rewrite reroute_compute

commit 946b5985e0c9aa31fc479cd67c9ee629f9d9923d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 16:47:27 2011 -0500

    syntax

commit 5f50377b8de4ef2337f995e1834773bd4e59c891
Merge: 2a540a6 aa08e2a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:47:25 2011 -0400

    Merged trunk.

commit 21fc789d8a3c01e10fa6b2f96c366487d04caaee
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

commit 79bec558d7356ca394cbf914b0b7288a6faae49c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:36:08 2011 -0400

    Fixed bug.

commit 9b5417c8a7a6b3f7f52b3b95ba2a0fe55bec3b08
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 17:35:31 2011 -0400

    Added metadata joinedloads

commit 6a8e86b4a1008c0087a4eeaaa8952d62029f04ca
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 21:12:37 2011 +0000

    Prep-work to begin on reroute_compute

commit a848f73393f50549899ef8cf02b0ce3367abc569
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

commit 2a540a6921575d045918db2eba0b9ca02a22798a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Jun 15 16:58:55 2011 -0400

    Passed in explanation to 400 messages.

commit 54f677d907005f53422af6e19a53fcae44615829
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 15 16:33:05 2011 -0400

    Fixing case of volumes alias

commit 011dd58257b2b437a0f970398644e066078bfe56
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

commit 838c3eca97e2521c2707e307adc9dd627c40d1e8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 20:11:34 2011 +0000

    Adding uuid test

commit 561f0b0db7ed5c021aee583b610ecba74dd4bb86
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:43:58 2011 +0000

    Pep8 Fixes

commit 3d4067dcd049bfdd9486fe478983aea4519ab2a9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:36:39 2011 +0000

    Fixing test_servers.py

commit ff6c3105172b8d167feddff8268ed3dc97b65a0e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 15 15:35:08 2011 -0400

    pep8

commit 81b70ee6ed5a3b49d7b01f7186407af4863e1609
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:30:48 2011 +0000

    Fixing private-ips test

commit a0c4c8a048aacc2ad93d582ad67e556dc22e989b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Jun 15 15:28:39 2011 -0400

    adding server existence check to server metadata resource

commit a86184626190dc027a26752d21174984a779c460
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 19:17:11 2011 +0000

    Fixing test_create_instance

commit 859706a41b0185db3e86fbb8852b1419b0011df7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:36:16 2011 -0500

    made the test_xenapi work

commit 6352ccc769ef453a243a93c96e391fe8890e4a92
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:33:53 2011 -0500

    test xenapi injected set to True

commit 5ceb02dc1ec248ef16c97129fb123034b5f505bd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:18:01 2011 -0500

    something else with tests

commit 667869f5c2f07cbdb95a0e3746f87a057c288cfc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:13:42 2011 -0500

    something with tests

commit 422a30f9993b047565ec759fbaf4f2676b6adc01
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 13:02:00 2011 -0500

    i dont even care anymore

commit f4e8ed7450ab3c7bdbb5c833f3c8d700fc8211fa
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:54:32 2011 -0500

    network_info has injected in xenapi tests

commit 6f8e7276b814ade4890054283b28dfe7a4c56ed5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 15 17:52:44 2011 +0000

    Adding UUID test

commit 3e72746eefe10f980d89bb9291fcbe94d0a36936
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

commit 1dfc5616f348b65b993abdd6a2a29a34c1369bd1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:30:44 2011 -0500

    added network injected to stub

commit a27383c9fd3df1c5a5f06893eeb5e1f754092496
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

commit 813553c3809f002a4b03761531160687464b33fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 10:21:41 2011 -0700

    don't provision to all child zones

commit 7eb3cdef53cd803302d8bb21ba25caa0cbfc6e4b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:13:28 2011 -0500

    network info to _create_vm

commit 2758646a20ff3e84206aba1eede0c37402b147af
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 02:10:28 2011 +0900

    fix mismerge.

commit 514c09b1de9905d6655a2f23854b14bca6fb0871
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 12:06:30 2011 -0500

    updated xenapi_conn finish_resize arguments

commit 59e1a9b5b532265281e980b6f7cbbf1a126c54b7
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

commit 5c95c1583a9ae577d2f77e3f8a31617322b7dfcc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 09:52:02 2011 -0700

    pip novaclient bump

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 0fb0720c87876113f7c2f0db7e0d7d4c5690fd50
Merge: b22427b aa08e2a
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Jun 16 01:46:24 2011 +0900

    merge with nova trunk

commit 88c4e0f70c72a0f4b95b106aa47a6ad4d9ee1fbd
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

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit db791f5ebfe25c178ef0405e62f378ea1d8adbf4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 15 11:34:30 2011 -0500

    typo

commit 656ad8bab61b4966207bb1b40d34b95539555ca6
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

commit b22427bb2bd00fac8716173052b576b27de5dbca
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.

commit 8f253060896c42ef85e1e6f3eb090df72227e9c7
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.

commit d7b6e26c82eb53fb874cb0af5f9743c9052e4882
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 15:21:20 2011 +0000

    Print list of agent builds a bit prettier

commit b4af73c0d03fb3e5c9d5c92de5627c50795aecb4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:41:09 2011 +0000

    PEP8 cleanups

commit 125594f2ed7aa78e465d2224d5693d48b1b77723
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:34:32 2011 +0000

    Rename to 024 since 023 was added already

commit 229a6f7eb52ef86dc6c5882fdebc7f2624999a2e
Merge: 711477d aa08e2a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 15 14:33:52 2011 +0000

    Merge with trunk

commit 47fc04a5d4b5db28693155313a5ca7330b79bb72
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 23:11:03 2011 +0900

    pep8

commit aa08e2a26c30ef720700073bd57b0020d157ba2b
Merge: 27fc469 1508551
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 f0b19ca7a202e3b4f0c4362f0de91e90f6efea1b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Jun 15 22:58:22 2011 +0900

    typo

commit 31c26878db50b1c02f6717fe6ee39ae68a6e7bbc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 15 06:40:42 2011 -0700

    None project_id now default

commit 27fc46985612626138df8f4710f17067b4db81ec
Merge: 475e2de db82e6c
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 6aaba08672627709223bf58799865952380e51eb
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

commit e206e0ceea66ecc17998398e3416810bcc9a61d6
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.

commit 37dfc990082f519927fc82efa40ab23215149689
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

commit 897d18607946381ff7162a86eedcaaf4be3a345f
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.

commit db82e6c47349c5aaf7ded849254e2739a3fcf2ef
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 files changed, 12 insertions(+), 12 deletions(-)

commit 777244d85868096efa6dc0844902e48b7cfae7bd
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 40d5832fe0b4c0dd66c0e2ee56dd2aa7791e2df4
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 files changed, 7 insertions(+), 2 deletions(-)

commit d750942c83c6ba6d066699c8d113c23424328b68
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 19:11:12 2011 -0500

    network tests now teardown user

commit 83fb62bb86a75d508aa0cc6e068879dc141044ee
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 f50b13414fc76a39dae2d74105275cb270e7150d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 18:59:20 2011 -0500

    network user only set if doesnt exist

commit ce829832d6d282fce3c9b7f51344b5db5204d3af
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

commit fa390867b7592dc2d54de71264449240619aeb17
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

commit 4f79d249287526f718f3659899876925a71204bc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 17:43:10 2011 -0500

    various test fixes

commit 475e2de48cab5c1735532a81d8b1a7b0338846f0
Merge: 7cb2ad7 b0415f2
Author: Dan Prince <dan.prince@rackspace.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 3dd9b3123ddd3357f5bd2ae8ff68da51423481ee
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:51:52 2011 -0500

    db fakes silly error fix

commit c2b92babcee5cdb0eb8e353381df114827dd3125
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:42:16 2011 -0500

    debug statements

commit 38dbc12d27a98a94c0bd4c15dd4142d4916047ae
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:34:45 2011 -0500

    updated db fakes

commit 1508551e52ebc405fe28ec58d0193ec92c233429
Merge: 4530413 7cb2ad7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 21:28:08 2011 +0000

    Merge with trunk

commit 4f8ce2f0d15f4344977f95bf2885cb5d5a5479cb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:22:51 2011 -0500

    updated db fakes

commit 7cb2ad777def4734728ebbdcf1bf809c72f5a138
Merge: ba9fea2 f2e809b
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 45ac0bba0c610f97795ff7430eb7e178e897a96a
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

commit ba9fea2567a62916962ca16b6920fdf867b498b1
Merge: 52b9352 7600ca1
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 231c54b9809cb955f5fc13ae20efe9158ee6e2d2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:06:28 2011 -0500

    db fakes

commit 6b47d49469fbf79a3b28befa1c0e890a67ba84ce
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 16:02:29 2011 -0500

    db fakes

commit 5b3c9d05f7237f0c766c3dfa29c6f31ac4c1d1d2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:55:54 2011 -0500

    updated libvirt test

commit 512f62cd9643b6a8532ada6ec43824929a8d21f6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:50:56 2011 -0500

    updated libvirt test

commit 6d4a9bac1db1d4f60de123bbf449ce7d84b8808f
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:39:16 2011 -0500

    updated libvirt test

commit 2a6d680003306d83eff3eeb23f1099b464e6dbb8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:30:19 2011 -0500

    updated libvirt test

commit a7f4db968e4350158c1036468a4a060560cda4e9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 15:24:35 2011 -0500

    updated libvirt test

commit c80d9e59854e30d23b09016ff66000efc9526f63
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

commit 7600ca13e18c7acefe516a99b723118f9bb9618b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 12:59:16 2011 -0700

    removed extra init calls

commit f2e809be580510e02247665806a562433b05e79d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 15:51:22 2011 -0400

    fixed HACKING

commit 52b93528693b1082c7a8d1d3f9700df18504b241
Merge: 10c3ef3 70a3ae4
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 d1430694f2899b7a85997156d881e5b842a9556a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 12:34:10 2011 -0700

    duplicate routes moved to base class

commit a266c6d843901c5b935c3fdc90b74bc86810839d
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

commit 5efa3a55fa103667160a34276901ff5884046cf5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jun 14 11:55:43 2011 -0700

    version passing cleanup

commit 10a25f65766c27f5b74774b4eae3430a18f48305
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

commit 01f191092e316c1567381ef426044493f79fea5f
Merge: efe3cee 10c3ef3
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 14 11:34:33 2011 -0700

    Merge trunk

commit efe3cee5cc7f36d96c3735af3f0f44e2e60a99c9
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 14 11:34:03 2011 -0700

    Move ipy commands to netaddr.

commit bab06769395cd675b85ae8933334a870f0ae8317
Merge: 25d468b 10c3ef3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Jun 14 13:11:13 2011 -0500

    merged trunk

commit 70a3ae450bf7c05c6184545803a33d05780d6b4d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 13:27:28 2011 -0400

    mp fixes

commit 45304137ffa3b7e16cbe7f13dd2ead1285e4cb06
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?

commit 7581af41f1a746536d1f4e85532c6be4cdbe8210
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Jun 14 13:17:13 2011 -0400

    pep8 fix

commit fbf140c873d277408215e8a390ab4f35237c9e49
Merge: ad3a179 10c3ef3
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Jun 14 13:16:05 2011 -0400

    upstream merge

commit ad3a1791e0ee6598f6d83358cd67a586e387fc93
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Jun 14 13:14:00 2011 -0400

    Stub out the rpc call in a unit test to avoid a race condition

commit 3cc3608e3d8e0321abe10d0c146527170b04ef05
Merge: 08b5034 10c3ef3
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jun 15 01:45:48 2011 +0900

    merged trunk rev 1178

commit 7279d3fc7901a04ca6fad4728715c4f9fc9ceb0b
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 files changed, 31 insertions(+), 13 deletions(-)

commit 6fc0ddb955b36f75f6ef52145c8c7acc35f0cb20
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 12:36:46 2011 -0400

    Improved errors

commit 08b5034ee4cf964c576cbe82607de816e2cc24d4
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jun 15 01:35:54 2011 +0900

    added kernel/ramdisk migrate support

commit 5d03c65166a3f463d8f0cca7d0be5a64af5e62a8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 12:02:15 2011 -0400

    Added faults wrapper

commit 6a267a0cacb8a07d7c3cd5b2265e7f810ac3ea06
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 14 11:01:47 2011 -0500

    remove file that got ressurected

commit 10c3ef3fd03618b1b6f50f6e3895e47a692580f7
Merge: 31f8e71 cdf9c4e
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 843b9253c106ceeae39a151e9e436fbc6d1441dc
Merge: cd71c2f 25d468b
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Jun 14 10:47:54 2011 -0500

    merge with trey

commit e3faaea6aecdcc8beedfee844136f569f45df5c0
Merge: 11bb319 31f8e71
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 15:36:46 2011 +0000

    Merge with trunk

commit 11bb31900c89c7c8dcf0f06488da01f45d6ce34b
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue Jun 14 15:36:07 2011 +0000

    autoload with the appropriate engine during upgrade/downgrade

commit 1af503ea4e5007246d245c2cfa9b30102e939444
Merge: b987d02 b4cdd8f
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 159b874401d1a2e83adb39b444ff034b14770be2
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

commit 31f8e71eca9f6ecdf04cdd9679d1aa2e50410d54
Merge: b2529d7 6e4b243
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 14 13:42:46 2011 +0000

    Fixed bug 796619

commit 020913df24a65f8e16620e56cf87e91ef2e60e14
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 cdf9c4ee4011e53b185cdad0ffab186164a68237
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 21:14:26 2011 -0400

    pep8

commit 3eb4b851609f6b2b8fa397fbf20ab44f529e7699
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Jun 13 19:57:35 2011 -0400

    Alias of volumes extension should be OS-VOLUMES

commit b948d6b02aa7415561a4e83560e4b42aefe99431
Merge: 5af8c92 b2529d7
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 13 21:48:16 2011 +0000

    Merge with trunk

commit b2529d7f9fbb588f86e7398f5d0a2cf18af9321d
Merge: a2b7d5f 8951972
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 5af8c924905332a03bed8b6d77fc962be762301a
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon Jun 13 20:46:25 2011 +0000

    Load table schema automatically instead of stubbing out

commit a2b7d5fe19dbde10f57e8f0722f8db5e10a5f713
Merge: 564fc7c 5df68d7
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 13 20:43:12 2011 +0000

    Removed clocksource=jiffies from PV_args.

commit 2396b4c97cda95f81f2329fd0de410eec12436e3
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Mon Jun 13 16:41:31 2011 -0400

    Test now passes even if the rpc call does not complete on time

commit 564fc7c8eb1cf2143c0abe83a8411b284dae1ac5
Merge: 666c478 974789d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 20:26:10 2011 +0000

    - fixes bug that prevented custom wsgi serialization

commit 5df68d71ce77bf785b8eae3616d12d31ae894f7f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jun 13 15:20:43 2011 -0500

    Removed clocksource=jiffies from PV_args.

commit 974789d8e2557fba24ac90f8448729bd6a819e94
Merge: 01716ca 666c478
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 16:00:14 2011 -0400

    merging trunk, fixing pep8

commit 6e4b243013deddb197c11898080d63900788a2c0
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 15:24:02 2011 -0400

    pep8

commit b7c28871e8580dda31bb8017b9c7de27443a493b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 15:18:55 2011 -0400

    Improved tests

commit 01716ca02033233fa5231f9fc08b4a13f366ef9b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 15:08:00 2011 -0400

    removing unnecessary lines

commit 8d6e31c41a60a4187399a055540bed976f47c61a
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

commit bef43537b148fec627a52a3d36fbcfe8b0167a44
Merge: d4f32e4 666c478
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 13 14:11:23 2011 -0400

    Merge trunk

commit 666c478db183ff0db2e6883a16b33c7b79759224
Merge: b4cdd8f 77c50a0
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 ef9b122f99b42a9d5104c5dd5b768b015a7e7f22
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 10:59:58 2011 -0700

    removed yucky None return types

commit 1ceab6b9efdad1f6e3379a81888c3720bd30b232
Merge: e826d3f b4cdd8f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Jun 13 12:54:43 2011 -0400

    merging trunk

commit 612b729ba2ea20142f165d8cd7407ed2239c200c
Merge: 35328f3 b4cdd8f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 13 09:43:41 2011 -0700

    trunk merge

commit 35328f3bfb32580ee58c0b99349e8507c834bffc
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

commit b987d0243cfbea13d74deb84066036658e7bb2b8
Merge: d2b7792 2ef53f4
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 7599b25389bc217df8620523ccc9076f3c0374e4
Author: Dan Prince <dan.prince@rackspace.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'.

commit b3ba4633cb7c4ffe5ac3b417244a77cf7aae725b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 13 10:10:45 2011 -0400

    fixed bug 796619

commit 77c50a02519ee948b35cc53b6793bd815decee1b
Merge: c7c603a b4cdd8f
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 13 08:54:21 2011 -0400

    merge trunk

commit c7c603af67582fcbfb3fa58e77947db2d21b000f
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

commit b0415f206c8480922ce8005ed61bee86b9572c31
Author: Dan Prince <dan.prince@rackspace.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).

commit 4c1a12b5643bf767b5a9704748605e37877580d9
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.

commit d52ac651a83a865da02b8f1eba3d2218d571f27d
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 18:03:45 2011 -0400

    Add a method to delete provider firewall rules.

commit 16f88e17d6180bbd01c264bd6a579b571a04788d
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 16:42:58 2011 -0400

    Add ability to list ip blocks.

commit 083685e732de513de147d7d90570e16d677e1e77
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 15:14:46 2011 -0400

    pep 8 whitespace fix.

commit dac5b3bd7f9a1971c58727f4674171f2ec783e5c
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 14:50:21 2011 -0400

    Move migration.

commit 2ba1b508f7841e7ee2653e469af0ce79ada51f73
Merge: fb24fae b4cdd8f
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 11 14:46:08 2011 -0400

    Merge and resolve.

commit 0822abc231ed97abdd8cbd3abf895c6c524d1c6b
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Jun 11 19:48:48 2011 +0900

    block migration feature added

commit fb24fae9ce4e42bd8daf516998e7c5152c9e13f6
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 10 22:32:33 2011 -0400

    Reorder firewall rules so the common path is shorter.

commit b4cdd8f91f0aacfc810a0a38cb88cffa2e808b41
Merge: b693aa0 beb53c8
Author: John Tran <jtran@attinteractive.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 b693aa0664c9ce5a08eff1318bacd9c67d325dc4
Merge: ef16340 862fdf9
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 ef1634024e3fe1e9eafc419eb81314eba8e3633c
Merge: cd2009a e663b0c
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 ca0abbd37b2152b430ca63345bad0f53d3945035
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 10 18:39:58 2011 -0400

    adding support for cusom serialization methods

commit 25d468bbf4ca9fe4da4caa6ae308fdc105e30b27
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 16:58:35 2011 -0500

    forgot a comma

commit 6b7eb6529985f8c16c2e3b930ac755dcd3a849c2
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

commit e663b0c2430b9270e8b241d84410ad0f512c2724
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 7b7456dab5b0dc8eed57583656693fd270399eb8
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:49:03 2011 +0400

    'network list' prints project id

commit 8bce5df2b9874eb74cfe21cb0e664564eba52bde
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 16:43:13 2011 -0400

    got rid of prints for debugging

commit 154d4356fb5f4a1bbc74aa19a27ef5bfdbd787ff
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:42:44 2011 +0400

    small pep8 fixes

commit cc378f4018e9260c78069b324582930c4cdc4eb6
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

commit ece1707e6e80d379b478f45f5e9d578f9b7ef2f4
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

commit 81a61df02940afd4f8afb7e4b19e1908526ec8ed
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Sat Jun 11 00:30:30 2011 +0400

    removed posargs decorator, all methods decorated

commit cd2009adcbcfe82629a74855b9b069659d2a463c
Merge: 7124d62 5ce639c
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 f1c74d71cec64f7ef79c036a4cf0f29938202846
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 15:01:58 2011 -0500

    forgot a comma

commit 21e41414652cf1620a00e6934505dd563bf70b43
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 10 14:57:02 2011 -0500

    misc argument alterations

commit 862fdf91dd265f630e5806f54d905b434b6ef2f7
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri Jun 10 15:28:17 2011 -0400

    force utf-8 encoding on toprettyxml call for XMLDictSerializer

commit beb53c828c6e59b70a6aa7e85849a582230a895e
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Jun 10 11:10:58 2011 -0700

    added new exception more descriptive of not having available floating addresses avail for allocation

commit f750f268dfdb8e28e691005c4c8d21c96a31b057
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Jun 10 10:28:03 2011 -0700

    raise instance instead of class

commit 153446610c962932640c9bde56db0d2fb380c820
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Fri Jun 10 17:26:25 2011 +0000

    Fix copyright year

commit 9c121c980eb73c7820f25cc4b576e43e319313cd
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Jun 10 10:24:24 2011 -0700

    style change

commit 8fc48833ecc85d0e51135c3ce6dfa71c59db74d5
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jun 10 16:53:06 2011 +0200

    Only update updateable fields

commit e826d3f81fbd63c676f35cd449aa7d348f6cdd71
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Jun 10 10:12:57 2011 -0400

    removing LocalImageService from nova-manage

commit 2c74d0ef4a831a33edbacf695ccda7d205a01774
Merge: 7124d62 bdf5e59
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 10 17:42:24 2011 +0400

    rebase from trunk

commit bdf5e599b34738a28516c2e61bd9884ffce84e99
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 10 17:33:54 2011 +0400

    decorators for action methods added

 .bzrignore |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 8951972ab392143ef6283e1a2627077a3ff2be36
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

commit c1177db2b311f647300ce877004faca83c5004e8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 10 05:27:05 2011 -0700

    fixed reraise in trap_error

commit 0d8b1ddf98a4af9e0df6e6971aff68ee984b72b5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 16:19:24 2011 -0700

    forgot some debugging statements

commit 45317b11881120d3fd174ab7b48760fa2f2b4f4c
Merge: e0c2ea5 7124d62
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 16:16:55 2011 -0700

    trunk merge and ec2 tests fixed

commit 711477dcd95eb3940dd7a5cd1b84a82c30566ad3
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

commit b88282255bb73e56801feff5d54887a6d2ae8cc5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 22:04:32 2011 +0000

    Add test for agent update

commit 2bf2e0b493a8ce43a8e5110280c097e3e5b6533f
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

commit 5ce639c1813a9b5ac6b94287582a2d97911b0980
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 21:50:34 2011 +0000

    Adding caveat

commit 5500968e68f59710b43df1b124dd14996b40f5e6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 21:36:20 2011 +0000

    Fixing code per review comments

commit 9fe82f730536f85ca36d7d8f3807fc7c66f567d0
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

commit 03bb0b3fd72d8a9c1925765ab07edeb4606fe419
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.

commit 805da5ea86527277e4df40ad8c825ebe6a1cb164
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 20:10:02 2011 +0000

    Add version and agentupdate commands

commit 8a740b8b045f66e122de11da660f1dbca1d49997
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

commit ed60c610610aacce0c078a903ffb6f4a3af84ed6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Jun 9 15:31:10 2011 -0400

    further changes

commit e0c2ea595f77a3ddd2bc4965b92cb06c9f463bb0
Merge: b7196ab 91a4b37
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 9 11:52:53 2011 -0700

    tests working after merge-3 update

commit 7989e33de579a1f441f0fdeea1db9f64fb612b53
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

commit 07b9854e2a12d90c7602de4c0fa6a23647bbd4ff
Merge: 1e9d878 7124d62
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Jun 9 18:50:41 2011 +0000

    Merge with trunk

commit df4f47f7dd00fe71749f8e22880fb17861547fe0
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Thu Jun 9 22:02:01 2011 +0400

    parse options with optparse, options prepended '--'

commit 3e10209b091b91164001e4e5c74f34f5cad24c9a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 9 12:05:51 2011 -0500

    renamed migration again

commit ba3be9be433ed58131a12fd96fc8c975af222cca
Merge: 0e60788 0e2072c
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jun 9 16:43:53 2011 +0000

    Pull-up from multi_nic

commit 0e2072c86a5018cd6de3a5ed8649127221243c86
Merge: 0e60788 a640a38
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 9 11:39:03 2011 -0500

    merged koelkers tests branch

commit cd71c2f1128acc5a59872c30131ed11445e26466
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 9 11:37:46 2011 -0500

    remove file that keeps popping up

commit 888a3c5279279f9d2b1bd44838b78dab259b53b8
Merge: 097516b 7124d62
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 14:43:46 2011 +0000

    Merging trunk

commit 097516b20335b06ec95f0c2f4c6cc625e0509ab0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 14:43:24 2011 +0000

    Fixing the tests

commit 0a33b009aad09d0666cb8fde44b37b0d20e66e44
Author: John Tran <jtran@attinteractive.com>
Date:   Thu Jun 9 00:01:42 2011 -0700

    matched the inner exception specifically, instead of catching all RemoteError exceptions

commit ac09cc86fa42aef83bead94d3af7d9ca1aee4880
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 9 03:35:59 2011 +0000

    Support multiple glance-api servers

commit d4f32e48af8b6dedfe59305f3ccf13da98dd37e9
Merge: 2759688 7124d62
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jun 8 22:05:09 2011 -0400

    Merged trunk

commit 27596886e60262e0ea3d808b144947f767f4c8f3
Merge: 1dc5aaf 6f7fa1d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Jun 8 22:03:48 2011 -0400

    Fix merge conflict

commit 64dc06f1833054373f9a60b7aaf27ee124877eea
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jun 8 17:17:40 2011 -0700

    removing custom exception, instead using NoFloatingIpsDefined

commit 4fc01ff3415aa413d32f735a441445b18c5e5d13
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jun 8 17:15:35 2011 -0700

    raises exception.NoFloatingIpsDefined instead of UnknownError

commit 1e9d878dc30a42d02ba773e5fe52dc9eb6cd0d24
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Jun 8 22:28:28 2011 +0000

    Normalize and update database with used vm_mode

commit 6fca26c9a71e45ee61dbaf371731fb21753106e3
Author: John Tran <jtran@attinteractive.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

commit 0e6078830adae5e958cb2989e8cf2d85cf751c0c
Merge: bb5471b 7124d62
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 14:52:05 2011 -0500

    merged trunk again

commit bb5471b35bd431f190012ed110ae2d703d112199
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 14:46:31 2011 -0500

    updated docstring for nova-manage network create

commit 7124d6297bba9abfc2da342e11ee65f6d14b45e3
Merge: dc75f71 91a4b37
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 dc75f71ba3fe79c3c4bd9060a9c53abe9296d6f6
Merge: 73e909a d319112
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 391cb0c0b6c94a241485b628ed908678d767d3a4
Merge: 7a7626e 0530990
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 13:27:00 2011 -0500

    merged trunk again

commit 73e909ab87643b035902ecee12d909b97789197d
Merge: b521779 13cc7d8
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 b52177919a91a42bf8c2c2613b414534616156e3
Merge: 0530990 c08002e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 18:06:26 2011 +0000

    Cleaned up some pylint errors

commit b7196abbeb2bb30718daf7334ffda318ec86350d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 11:04:41 2011 -0700

    tweaks

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 13cc7d87780427f32ef590ce86ae74bf124b69aa
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 8 21:58:59 2011 +0400

    PEP8 fix.

commit 7a7626ec1806d8dcaec1e0e0abd24b81b0fed799
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 8 12:41:09 2011 -0500

    removed network_info shims in vmops

commit 05309906b59a9d0ac7b0820f1cb0f50114394f6d
Merge: b4109ad d258d2a
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 b4109ad5350a9a08377df3526860fbf4cd247db9
Merge: 6f7fa1d 38ff4e1
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jun 8 17:36:09 2011 +0000

    adding Authorizer key for ImportPublicKey

commit 10d415f642f8629c4def658d77500dbff2d8159a
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 21:03:52 2011 +0400

    fix exception type catched

commit 3c524fa08fd7a4d899b12ebed149e924e66f83c0
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

commit 91a4b379bae1dc93501b717e202c9f664816a579
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 08:13:23 2011 -0700

    removed straggler code

commit 2de360369a5fc2df291e9e3b98ad5069bd9fbab6
Merge: d1040ac 6f7fa1d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 07:12:12 2011 -0700

    trunk merge

commit c08002ef087009f5015376cfcc1d6ebce901f649
Merge: 613a3bf 6f7fa1d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 09:28:04 2011 -0400

    merge trunk

commit 613a3bffd4712012fd59cca21c7aeb04581ce7b1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Jun 8 09:21:38 2011 -0400

    pep8

commit a810c93a240fe72538f7b32a9b3aee172b471bca
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 8 08:59:28 2011 -0300

    removed autogen file

commit fe49f0faaf8696f3bc09f41af683af65d56d7cf4
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

commit 7ee336b64a3251dde285fbbd02d1aac9f740fd55
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 13:50:33 2011 +0400

    added tests for X-Auth-Project-Id header

commit 9893408b7ea1952fae186bcd891c1847a7499e3c
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 8 13:49:00 2011 +0400

    fix fake driver for using string project

commit 38ff4e11afde17c2e94eefacf4976845b643de53
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Jun 7 14:36:40 2011 -0700

    adding Authorizer key for ImportPublicKey

commit 6f7fa1d9a272adce1d2e40c9fe3ca5d89b7d4bc0
Merge: 36c2059 4884781
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 36c20593f89ab20a6dbbe0e9b04a63756406da52
Merge: e8c4c34 09bd792
Author: Dan Prince <dan.prince@rackspace.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 a640a38b36f41af55a250557f1b851647a07be3d
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:40:24 2011 -0500

    remove the debuging lines

commit 0d128694c21b86208efc1faf003578c976199651
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:39:36 2011 -0500

    remove the old stuff

commit 094f7be6c07dc555a3b4fc1a60a76a884a82ba83
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 15:35:39 2011 -0500

    tests all pass

commit d258d2a2588faf7ed1537e61ac6f96bba0ca8779
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 files changed, 8 insertions(+), 6 deletions(-)

commit 09bd792adf201f1c02134f6093fc910a19d6932b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Jun 7 16:05:03 2011 -0400

    Added test_run_instances_image_status_active to test_cloud.

commit e8c4c349d99523f3b09d597f9799ac19e70bf3a5
Merge: a45f5f5 b51ccbc
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 4884781dcc5088732f3ebdc447270375cdb5e45d
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 15:17:34 2011 -0400

    pep8

commit 281e5f3a4e5d754b9b72aeab7e3daa00c97a6f13
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Jun 7 14:48:13 2011 -0400

    Removed use of super

commit 5145232ed73621c5a589279fda517f571991dd15
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

commit 53a38b3a3d22929557f500145ae33c9b2bcd78f1
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

commit e187ee14cd02915263fc88462dc436379071ce27
Author: Dan Prince <dan.prince@rackspace.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.

commit 0e9cb8fa4d0d619ee737419f9e2457870837de11
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")

commit 1fece77110818c9d837af6f54a13b6cebb0b9b84
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Jun 7 13:32:06 2011 -0400

    removing local image service

commit b51ccbcf43fe6f0f5970bf57de3ba9c500f8a613
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 7 11:45:25 2011 -0500

    Remove unnecessary docstrings.

commit 6d53af6b52c1a6a74163153cbde9abb47e1f4b13
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jun 7 10:47:14 2011 -0500

    Add the option to specify a default IPv6 gateway.

commit 358d42642af79ede4d379a47f770f7ccf18465ad
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

commit a45f5f5f5d53c8352e9608d1c8b335bc03668cb3
Merge: 9433ddc ff3b92b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Jun 7 15:25:59 2011 +0000

    Make libvirt snapshotting work with images that don't have an 'architecture' property.

commit 5cae86bf6527f04abee5fa7347ee130e4ba9d4d6
Author: Jason Kölker <jason@koelker.net>
Date:   Tue Jun 7 10:22:41 2011 -0500

    take out the host

commit ff3b92b180d7ae8463c4cc380b6bcc01c0237fd7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Jun 7 10:47:29 2011 -0400

    Removed empty init

commit 1dc5aafb29dae0579b967f5d6276e5a3da557400
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Jun 7 10:39:30 2011 -0400

    Use IPNetwork rather than IPRange

commit 92051d6fe45ba4483575abebb68b4246b1d142cb
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"

commit d1040acf5e3ffb4c51be0084f0673e5995515028
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 6 19:05:31 2011 -0700

    sanity check

commit 9433ddc20a7d01059c90da1d1696704bc8777422
Merge: 6c4ff8d 8a3b4a0
Author: John Tran <jtran@attinteractive.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 0df173c5220f544fbb6afe77317ee43165894174
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jun 6 17:58:40 2011 -0700

    fixed up tests after trunk merge

commit 6c4ff8d54ce5fee4e75796267573bc33142381d7
Merge: c0ba9c9 55a4db9
Author: Dan Prince <dan.prince@rackspace.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 8a3b4a07ff515bcc01d960a992e5f93181f01d5f
Merge: c10a4c0 add99db
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Jun 6 14:37:30 2011 -0700

    merged from trunk

commit 2e5e92fc27521d7c3850bf31836d8afe0e479329
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:05:28 2011 -0400

    Remove more stray import IPy

commit 59142f93c534c431a2ee5ad61c74c36a6f88f7c9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:04:12 2011 -0400

    Dropped requirement for IPy

 tools/pip-requires |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit ecc68754c64d733dcae194413f2c8a630166f59c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 17:03:50 2011 -0400

    Convert stray import IPy

commit 55a4db9581099674a47ac174a83360136ae5692b
Author: Dan Prince <dan.prince@rackspace.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.

commit 7c39c2af5bca7b5d8d9ff6fdd0f5744117840f59
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 15:59:39 2011 -0400

    Removed commented code

commit ecadff5aeca06d66cb1a3d4f2a513c817930c4f2
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.

commit 11fde5f563bed58d6a0eff25b75650664f7d4ca6
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:35:33 2011 -0400

    Remove ipy from virt code and replace with netaddr

commit 5d4451889a1cfbec5be5f103347a5bee42a1fb04
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:34:51 2011 -0400

    Remove ipy from network code and replace with netaddr

commit 8ac2a8f398ff21a1945f114d3b347c9e57b0524e
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

commit 411fb00b4bbc9fecb5f99288db2ee0e047ccae9b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Jun 6 15:32:48 2011 -0400

    Remove ipy from nova-manage and use netaddr

commit c0ba9c9b74cd648811d036bb0f5b95cf632b9c97
Merge: add99db 18b22aa
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 18b22aaf2bfa31c3833b87dc59a2027317c2c3c4
Merge: de21d2a add99db
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 6 14:55:04 2011 -0400

    merge from trunk, resolved conflicts

commit add99db4bdddb3dc4bbc2db89eaaa779b08eca78
Merge: 0ad50ae f3c4230
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Jun 6 18:25:54 2011 +0000

    Update the OSAPI images controller to use 'serverRef' for image create requests.

commit 0ad50aeadf809de2cdd7cda64e1774adb0ff367e
Merge: da80cc6 7328be6
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 53c3de7188712d7df0d40a4a441764223a737237
Merge: 370602a 94f4398
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Jun 6 12:20:08 2011 -0500

    merge with trey

commit 7328be6a0f691df2b0977100e297205913ddacaf
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jun 6 12:42:27 2011 -0400

    Change to a more generic error and update documentation.

commit 370602ab4028d4a481bf12b675deadd3069f0d50
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Jun 6 10:56:04 2011 -0500

    make some of the tests

commit bff0ff45e3f5169df2068a2524cdcb49fc32d959
Merge: 99b11ff da80cc6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Jun 6 11:54:11 2011 -0400

    Merged trunk.

commit e59f22e0fd2fe19652944ee1e83ab8c7ad65fe89
Merge: d5122ea da80cc6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:41:04 2011 -0400

    merge trunk

commit d5122ea0e59bcfc78bca5aa8d54ba1333d4ae579
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:39:34 2011 -0400

    Ignore complaining about dynamic definition

commit bddfe1572730fd30c04d1374bb4fbc0ff71a0295
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:29:05 2011 -0400

    Removed Duplicate method

commit ac68f23d2eab9e229fae677c02b489ac527eb408
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:20:25 2011 -0400

    Use super on an old style class

commit 389a8ff6668814bb63f27e88598101895f5c8d39
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 11:00:51 2011 -0400

    Removed extraneous code

commit 94db40ff5a82ff9b14690fbdebc99efc69b2827c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 10:49:29 2011 -0400

    Small pylint fixes

commit de21d2ae201f7eccd976365bc18dd5c25e0a237c
Merge: cd51624 da80cc6
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon Jun 6 09:38:31 2011 -0400

    merge with trunk

commit bdbbb270214144fd07358d6c5c0d6c4deffb82b2
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon Jun 6 09:18:13 2011 -0400

    Fixed incorrect exception

commit da80cc6be9408b1e1824f3a58bcda503b7eedcf6
Merge: 82d7c0f 13fda2c
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 13fda2c474d61e8e34f272e735bbdd54dd19f1fd
Merge: 820a8c4 82d7c0f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jun 3 14:43:12 2011 -0700

    merge with trunk

commit 820a8c45330cfbba2b26f7b4dd0a5ca800b47b78
Merge: 9201100 7f11d3d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jun 3 14:41:25 2011 -0700

    resolve conflicts with trunk

commit d319112f571d90dd47200bb6b7238742b4418334
Merge: 2486b71 82d7c0f
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Fri Jun 3 16:39:48 2011 -0500

    Update migrate script version to 22.

commit 82d7c0fd647bb217e13332b0f5b8991f662ad46e
Merge: 437d2aa 272d1f8
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 94f4398ff1042a59cb6658ceb8b739a4bfac679a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 15:55:09 2011 -0500

    renamed migration

commit 0a94ac3ba11eac94e4c3c2e148ae66af41431f90
Merge: 4702bcb 437d2aa
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 13:32:42 2011 -0700

    trunk merge after 2b hit

commit 437d2aa311fdc695f75f05139f3bde61adb969ff
Merge: 926d49b 842cd80
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 19:36:09 2011 +0000

    Distributed Scheduler developer docs.

commit 926d49b28f1656da23558eba266ff8c60163c6c5
Merge: 8c3e35d 3b42efc
Author: Dan Prince <dan.prince@rackspace.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 40cc5626cb027ee6b40fb4cfd29525bb3270884f
Merge: 124b27a b0d5f74
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 13:34:54 2011 -0500

    merged trunk again

commit 272d1f80d6b0b964789c4ea533c028dc53fc7c89
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

commit 3b42efca571ed5137a8a7732042156ef08bd1097
Author: Dan Prince <dan.prince@rackspace.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.

commit 8c3e35d54c0dd2970ea376892a7ecda2214a8310
Merge: b0d5f74 4a231df
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 124b27affc280fc00701ab70e99041789d7a80dd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Jun 3 12:48:40 2011 -0500

    merged koelker migration changes, renumbered migration filename

commit 45c3fc381d794513d47ec55a18bc707325dddf9d
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri Jun 3 21:13:16 2011 +0400

    fix comment

commit 4a231df6b4f17e70ef3d91c60309567e2fcf5f59
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 files changed, 0 insertions(+), 1 deletions(-)

commit f3c4230d6acf317854d4c9fc0c54f7890586c30d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Jun 3 11:34:49 2011 -0400

    Added a test case for XML serialization.

commit 1c7e6d8b27b0fc3a41a0cea413e699d6f9389e71
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

commit b0d5f7489a8ab2519894dec930527334a4d0b5bf
Merge: 1884749 b5c3da8
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 18847490f299a3b7d9117555f2e47512e1b14969
Merge: 9a745f9 2ed8e31
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 89ab54a34652afff2f749dd8ceeedc3ea239f149
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

commit 9a745f99efe7d82cbfac10254bd43536ba40d220
Merge: d9c6250 14d313e
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 0435fef76366e542b0d272fa4ea03750427b2816
Merge: 6e3c904 d9c6250
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Jun 3 10:32:39 2011 -0400

    Merge w/ trunk.

commit d9c6250e0e794a6dd3833f32ed8fdcce19ea98d6
Merge: aa20150 73f8919
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 99b11ffe2a608c1b3ff45f402656e05e22429ce0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Jun 3 10:23:38 2011 -0400

    Make libvirt snapshotting work with images that don't have an 'architecture' property.

commit 6e3c904cb0bed42b2903a23ba34528da5a3a4fa9
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Jun 3 09:31:43 2011 -0400

    Add serverRef to image metadata serialization list.

commit 797063477dd3c99eeab62f21fddee7c3833b21b8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri Jun 3 09:24:46 2011 -0400

    Fixed pylint: no metadata member in models.py

commit 8de21678ebe81fdbaf8eac60ba19cd43f1acd6dc
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Jun 3 08:50:30 2011 -0400

    Implement OSAPI v1.1 style image create.

commit 842cd80820cab0e14cdc1e4fb564ffb44d909160
Merge: 88a1db1 aa20150
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 05:24:12 2011 -0700

    trunk merge

commit 88a1db1db10ce49f0e66c761608bd7d87c953372
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Jun 3 05:23:43 2011 -0700

    little tweaks

commit 14d313efd9110e9ee98c1f35de96473187b56a39
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 13:39:22 2011 +0400

    Flush AuthManager's cache before each test.

commit b141f012c8f26b42361fddcdee331b7ddc1fddaf
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 12:37:58 2011 +0400

    Fixed FakeLdapDriver, made it call LdapDriver.__init__

commit d3f21661e560a56f064c80de80a32ba9f15f0e09
Merge: b49e95b aa20150
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri Jun 3 11:16:10 2011 +0400

    Merged with trunk

commit aa2015017a3a3207a77e0e7a7e58800c2b2269d5
Merge: 1652b96 ff4b015
Author: Dan Prince <dan.prince@rackspace.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 b5c3da8c9f8df92e0a557d3db85ee9570742d0c4
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 files changed, 1 insertions(+), 0 deletions(-)

commit 5d2ba795e01afc3532b4653322ef506345d1003d
Merge: 7e84e83 1652b96
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Thu Jun 2 21:17:31 2011 -0500

    merged trunk

commit 7e84e834547e4fb4f934a86b6f847dd6d2ac3e99
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 files changed, 1 insertions(+), 0 deletions(-)

commit 1652b96a1d70bba2a2709861890925cedb3de68b
Merge: 84c8819 d721aaf
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 ff4b0159100e02022cc3a30b468f92b2610025ab
Merge: e0b2b23 84c8819
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Jun 2 19:24:09 2011 -0400

    Merge from trunk.

commit 527f30f07f08bf89f8a3a4cd67e47a720bd2ebe2
Merge: f8c64ef 84c8819
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 2 17:46:16 2011 -0500

    merge trunk... yay...

commit 2ed8e31999024efafd5b9e3124f9f50e969e0230
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 14:51:30 2011 -0700

    switch zones to use utcnow

commit 59e9a0271dadd205362b62f6d5d4eafc0b830751
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

commit 84c88193b33977151e818d738c31942867f9891b
Merge: 93a00c6 b53a091
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 19:10:47 2011 +0000

    Fix error with % as replacement string.

commit 73f8919f9026b95567d5dc73749af5ecdcfd345a
Merge: d288b4f 93a00c6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jun 2 14:08:19 2011 -0500

    Fixing conflicts

commit d721aafce26d958d70abd3b8f81e8d82752ffe99
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

commit b53a091a2f892e4ad161986492ddaec10f7db1ec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 11:28:41 2011 -0700

    use %% because % is a replacement string character

commit f8c64ef8928f0e823d59f0952f4c0c99eb4e01b6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jun 2 13:21:35 2011 -0500

    some comment docstring modifications

commit 93a00c69f4a9c69bd4bd5958179dc31d3a8f54a5
Merge: b82a406 311e361
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 b82a4060a7f665cbdc53778099906d41eddf50c7
Merge: 0077aa6 db21f78
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 311e361c5fe01c6f2145f0fa6195f8c1bb8665f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 2 10:20:26 2011 -0700

    don't use python if readlink is available

commit 0077aa687b933899faa5fafa6662ed3323b2607b
Merge: cfb39d3 8c670dd
Author: Dan Prince <dan.prince@rackspace.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 cfb39d391ea72ff73ac2ee89e8774f282727cef0
Merge: 84a413b 9eb410c
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu Jun 2 17:16:06 2011 +0000

    Bugfix #780784. KeyError when creating custom image.

commit e0b2b23b7064c25818aff294bf72d272cff824fb
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jun 2 13:00:17 2011 -0400

    Remove some of the extra image service calls from the OS API images controller.

commit 756061574830c4f8b52d1d52bd701686385d6a43
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 2 11:43:53 2011 -0500

    pep8 fixes

commit 831104d3fdcce2151949adb732c2f16d9663f0eb
Merge: 9fa2dbd f8f744c
Author: Jason Koelker <jason@koelker.net>
Date:   Thu Jun 2 11:35:49 2011 -0500

    merge with trey

commit 9fa2dbdb742e752545d85be64255c5fe97bc1d0a
Author: Jason Kölker <jason@koelker.net>
Date:   Thu Jun 2 11:14:18 2011 -0500

    make it pass for the demo

commit cd51624052e800b3545d3c2a3bfd9b95570ac1b8
Merge: 8877005 a3b4272
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 2 12:03:11 2011 -0400

    Merged with Will.

commit 8877005a884352af5debbf2be526794d9e19fcf8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Jun 2 12:02:16 2011 -0400

    Minor comment formatting changes.

commit a3b427207f357c974318219b1383130621bc3d64
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

commit bcc5e3d61cc7b47c04d889e1725a8a00b36da011
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jun 2 11:38:20 2011 -0400

    Remove comment about imageRef not being implemented.

commit 8a158c80e08eb4f4df7f99e38d6ee21ce2921f84
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jun 2 11:12:35 2011 -0400

    Remove a rogue comment.

commit 789168246bfe26ca93badf8bca1f1cc453b35627
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 2 08:05:46 2011 -0700

    more tests (empty responses)

commit 733b6a1be4cc5b7029ad1bad8a9b482c8e83001d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jun 2 07:57:35 2011 -0700

    get_all with reservation id across zone tests

commit 0db267143a94c82356dc735627a639d829097881
Merge: b285bc8 84a413b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Jun 2 10:09:18 2011 -0400

    Merge w/ trunk.

commit 83d8037bc2d7ee7931a4612d678541fddc130161
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 2 09:34:01 2011 -0400

    move index and detail functions to v10 controller

commit 1a8ccbd9ea4b5031f91ee4632f0014a135557d2e
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu Jun 2 08:53:13 2011 -0400

    got rid of prints

commit 9eb410c235d0b5a565dbb20b8ba261abd030e41f
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu Jun 2 10:29:58 2011 +0400

    Refactored after review, fixed merge.

commit b285bc8aba10c3a7683de9219df336b9d7674c56
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.

commit 2dc342598aa6f7ff35c4991f5a8f1fc31fba13c5
Merge: dd67b1b 84a413b
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 23:13:01 2011 -0400

    merge from trunk

commit dd67b1bda4da1ffa013dd0f025d09d5b84d63059
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 23:11:50 2011 -0400

    got rid of print debugs

commit 6a6dd0d2983cbb7453677bfea250e62c2449d1bb
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

commit 9b2ae7568a5e5344e792da2fb7e5623736a45d72
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 1 18:55:41 2011 -0700

    missed a couple chars

commit 684e10b59928ae44cf8978bc29bee76539069c35
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 18:17:04 2011 -0700

    Little cleanups

commit 4825a0de1c6a44263ec72e1a9e45fae9819ac269
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:53:45 2011 -0700

    pep8 and all that

commit 615e86d4cbeac9a9529357e5665226fbb0322f0e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:49:49 2011 -0700

    tests all passing again

commit 5514629388b74b75dccbbb748db9723e34d2f43b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 17:35:49 2011 -0700

    list --reservation now works across zones

commit b0f4428142c3c83c5c0c3efa047ffc72f8d56bd6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 1 16:51:26 2011 -0700

    fix novarc to work on mac and zsh

commit 627448ac7c4f52890f51e67f8ba2d5a957ffd555
Merge: f9b0b74 84a413b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jun 1 19:44:01 2011 -0400

    Merge trunk.

commit c10a4c008922d0fae01ba083b7f878adac769b24
Author: John Tran <jtran@attinteractive.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.

commit 84a413b9c4bb28660144a87e42c7af21376f17fd
Merge: 811a7c8 43cacc2
Author: John Tran <jtran@attinteractive.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 e168f154d53765a005d5ac7a1547fd9e39deaab3
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 18:12:21 2011 -0500

    start the flat network

commit 3345155e4bb77bdc9d3b343cb43dc0738e129f05
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 18:11:59 2011 -0500

    more testing fun

commit 43cacc276163027231f35ce4ad48b5b04436962d
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jun 1 16:01:41 2011 -0700

    fixed as per peer review to make more consistent

commit 45dd5b950f56189c13b5eb8ed7f1f118ae104119
Merge: 56c0621 811a7c8
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Jun 1 15:54:45 2011 -0700

    merged from trunk

commit 811a7c8a96f0d511f9ee79f5782d3664ce57351b
Merge: 67ca340 4c99906
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jun 1 22:46:01 2011 +0000

    Implement the v1.1 style resize action with support for flavorRef.

commit 67ca34006b830897d5759e09e8573810c77c3036
Merge: aa47cd5 7506249
Author: Dan Prince <dan.prince@rackspace.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 aa47cd53b1a69d2f2bf034182fe0d473a542e7ab
Merge: 3fdae05 06ff59c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 1 20:21:20 2011 +0000

    Support SSL AMQP connections.

commit f8f744c86d46ffdc8fc3a0706c2bd7d527dcf85b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jun 1 15:01:47 2011 -0500

    small fixes

commit 06ff59c57c67cd5b96c5acbcdd7f58c8404590af
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jun 1 14:46:05 2011 -0500

    Allow SSL AMQP connections.

commit 3b23c89d04d8fbc2cd83c74e20aad7a5b39d960d
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

commit 89456eceb76d28ab3c7f7915c3b25af96fc6e763
Merge: 8dfacdd 3fdae05
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 15:38:17 2011 -0400

    merge from trunk

commit 8dfacddc641ca24937e726f91ce9fb4114f66277
Merge: aee57f4 d1da8f9
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 15:28:34 2011 -0400

    fix pep8 issue from merge

commit a3ef5e9454a1f0b7013ac034b938e15b18ce589f
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:14:25 2011 -0500

    coose the network_manager based on instance variable

commit 4b95def69db667a83de3893de8d1b476c751e182
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:10:48 2011 -0500

    fix the syntax

commit 4810117692ea877bffb023f77441c51b522316d4
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 14:09:26 2011 -0500

    forgot a comma

commit 3fdae058ac56b9d6aaa95612b6b0ea7ce04f5322
Merge: d1da8f9 f1cb1d0
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 aee57f4a94dac100891fab8846ec7384cbdaf2ea
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 14:58:17 2011 -0400

    touch ups

commit 7506249dc6010a6b09f223c40034e1b75b81343e
Author: Dan Prince <dan.prince@rackspace.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.

commit 78f0f95a6240285b28129708fcf556e9c5749545
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 11:52:33 2011 -0700

    basic reservation id support to GET /servers

commit d1da8f90e6c7ee6d58640678d3fc562a6ea166d5
Merge: 3b172ab ad886d0
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 930a84efea616befe24a93177084be079d28c191
Merge: bce1c54 3b172ab
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 14:34:22 2011 -0400

    merge from trunk

commit 0b15ea81cb28609eb66a4235c6c00c7eb09b7602
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:43:42 2011 -0500

    make the stubs

commit 4cea0d31e24f7f59fb991040a8f9111e5babbef2
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:41:45 2011 -0500

    use the host

commit 4b97cd92b2cc7fa311c79b01e5d3a26587411cb3
Author: Jason Kölker <jason@koelker.net>
Date:   Wed Jun 1 11:38:41 2011 -0500

    da stubs

commit 96dcd7231c69db7f923e120e2934bdbf6212da80
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 1 11:38:10 2011 -0400

    Bumped migration number

commit 4403f70b4e9e2b06bfaf138a122d3e36fc29433c
Merge: 3eaa3a4 3b172ab
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed Jun 1 11:37:47 2011 -0400

    Merged from trunk

commit f1cb1d0d6d37fe2797a76bd9fdbf209fbd0f4e58
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:58:17 2011 -0400

    updates to keep things looking better

commit d3a554341b9692bbddc3bc32e4963ae75d009a75
Merge: de6f834 3b172ab
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:40:56 2011 -0400

    merge from trunk

commit de6f8345cc2024b2aa5f056a97560c4308db7a34
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:37:54 2011 -0400

    fix pep8 issues

 tools/install_venv.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b49e95be4bc89fb4a434197bb509320e597e347f
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Wed Jun 1 18:34:54 2011 +0400

    PEP8 fix.

commit 1311bac4ecb9ed04453606c89eb9333278013abd
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.

commit bce1c54c02ec46e953d6df1df8d95ba15f4cf48e
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:31:53 2011 -0400

    fix pep8 issues

commit db21f786801a83a1e8abcff6c375b3dd946988a8
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Jun 1 10:17:00 2011 -0400

    pep8 fixes

commit 3b172abcee216d42b41214610e6a0292e004e032
Merge: 2ef53f4 a2ed2b7
Author: Dan Prince <dan.prince@rackspace.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 3c79a41913c46c5a48efc5b0c088a362ae95242d
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed Jun 1 10:00:15 2011 -0400

    fix filtering tests

commit a4a91e9ff8ea542570087952a83a406e8ee67111
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jun 1 09:20:15 2011 -0400

    Renamed migration to 020.

commit d2131f933f904f84dfb71279b82409888803b28c
Merge: b93e46e 2ef53f4
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jun 1 09:07:44 2011 -0400

    Merge w/ trunk.

commit ad3562141daec3720333a64529dfcd1e85258ea0
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed Jun 1 16:40:19 2011 +0400

    osapi: added support for header X-Auth-Project-Id

commit 809fc6dacc59ea514341530ed98c6273e9f38909
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jun 1 05:36:41 2011 -0700

    added /zones/boot reservation id tests

commit 2ef53f4c39a61a63507724c8edec154242e1b26e
Merge: b1cab11 c405f3c
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 b93e46ee427456ed17dc89488a7453422f3f8368
Merge: d7a387e b1cab11
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue May 31 23:16:22 2011 -0400

    Merge w/ trunk.

commit b1cab115c41e1951e05a03c5e8fbad2ecbb186b1
Merge: 94233ec d9af513
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 d288b4fce64ef93cc492826b4563972771819546
Merge: 46475a3 7c0a7d0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jun 1 00:54:33 2011 +0000

    Fixing a bunch of conflicts

commit 9fa6598b4a1e80c8e42f44008931720e2c18a8ae
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 18:16:30 2011 -0500

    add new base

commit a6e9c624874a1cf241946548e0a40b99550c8cb7
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

commit d9af51330506a380155192e6b166eccc6e6e1152
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 31 15:50:33 2011 -0700

    pep8

commit 2486b7174b4f1b23f921b3bcbb876c6b49e7a838
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, 0 insertions(+), 653 deletions(-)

commit 2a4692dfd269f138ce101ee5ec88982ebeb6643c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 14:56:04 2011 -0700

    basic zone-boot test in place

commit a9bc9098355a889e6a20ef9cd196c39113b65c41
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 files changed, 0 insertions(+), 0 deletions(-)

commit 10817f405ffecabda4d339f9524a1a0457e6b1b4
Merge: 0c89566 94233ec
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 438b4165fb858fa57363e353493605342a02744b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 31 14:49:47 2011 -0700

    switch to using webob exception

commit 0c89566b15aaff0e2515c6f458301b2fd332559d
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:41:32 2011 -0500

    Added new snapshots table to InnoDB migrations.

commit 94233ec921b25cb2856a55382eb5ad987ca54df3
Merge: 7c0a7d0 85f1a7b
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 2c8095d3cf9a700f407905e8dc9abfacfe2b9dc3
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:28:43 2011 -0500

    Cleaned up bug introduced after fixing pep8 errors.

commit 46475a37cd476743819b579c2f17ac131459f5aa
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 31 21:23:36 2011 +0000

    Fixing Scheduler Tests

commit 7a9cc469c98be360ac9f08bd72db05bbf62ba90c
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 16:23:17 2011 -0500

    Cleaned up bug introduced after fixing ^Cp8 errors.

commit 7c0a7d0ac0513196ead8bbd8255b1960dc7afb75
Merge: ca909fe 4a2180b
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 bebe59d62390fee3f56f0a46d11eb941a9e81eef
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 16:00:05 2011 -0500

    make the old tests still pass

commit ad6c0a35e7674fc02660cc18fc8b867090db09e7
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 15:53:54 2011 -0500

    rename da stuffs

commit 245f9195a17cd084bdd57f5ff36e8d4cc8f592fa
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 15:52:57 2011 -0500

    rename da stuffs

commit 2a4ba456e7f82857805b40c48889c9c8e1a2751f
Merge: 86561b0 ca909fe
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 31 20:49:49 2011 +0000

    Resolving conflict and finish test_images

commit 31e27d773a902c656036fece79ad15fdaf4ad75b
Merge: 8aa099a b133cf6
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 16:44:44 2011 -0400

    merge

commit 8aa099a802456758a4ae581aa6c74b08f7bc45b0
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 16:43:25 2011 -0400

    added tests for image detail requests

commit b133cf65a0926e3fa9d7d591f97198329a32962b
Merge: 846a6ff ca909fe
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 31 16:40:38 2011 -0400

    Merged trunk.

commit 846a6ff0766d91c72972e43a807a0e3ca63db1a1
Merge: 20515bd a1b0b30
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue May 31 16:30:09 2011 -0400

    Merged trunk and fixed conflicts.

commit f9b0b741453c07103fdafd4cb4fae387d849e33f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:28:46 2011 -0400

    Whitespace cleanups.

commit ca909fe86874899848d3e962211a0092404e8089
Merge: a1b0b30 4845042
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 d2fb1e00ab4fafd61d14a3ad6a9b569b1c683fb2
Merge: 5084b47 a1b0b30
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:20:35 2011 -0400

    Merge Trunk.

commit 5084b47c205dfe7d509d300d2e1cbd39f7ff2273
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue May 31 16:20:07 2011 -0400

    Change version number of migration.

commit a1b0b30e582b88ea4bd345ab354ebe8f565dedfc
Merge: 142d04a ade63eb
Author: Dan Prince <dan.prince@rackspace.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 7d7802d9f579775b704ce8811ec55af60a087739
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

commit 142d04a20e5951893860d2ca2a691889c7d0f1fd
Merge: f4d495b 4243f46
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 f4d495b75c08e3373248f5b8538101e1d55ceace
Merge: 419ab34 4a77448
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 ade63eb6a99d539a2785855167b3e6f9a65ecf85
Author: Dan Prince <dan.prince@rackspace.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.

commit 20515bdf82950a8058fabde6e16f5927ab944c56
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 14:21:15 2011 -0400

    added tests for GlanceImageService

commit 419ab346258da358407c5d2a1457dd96a06e1f24
Merge: 7f11d3d ed1cbff
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 5e7bd752623900bfc9082fafb7d74762935db861
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.

commit ed1cbff1d0a7b77cfc09f942b7c74c45b9b20921
Merge: 672fbc1 003fd93
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Jun 1 02:45:26 2011 +0900

    Rebased to trunk rev 1120.

commit 4a2180bf80c4c704c37c11be3d906b952d5f044a
Merge: 29e58be 7f11d3d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 10:39:56 2011 -0700

    trunk merge

commit ce761605d956040bdf52541367fc689b4759b8c1
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)

commit 3e96a82bfb2464532a47950529c3633ccb76416d
Merge: 80ddac5 5e04b21
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 6674104dd6c9338c6902c1857f0c3fe87b7cfec3
Merge: d36417a 7f11d3d
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:51:24 2011 -0500

    Cleaned up text conflict.

commit 80ddac5a10f7f5f8a88e42da9dbba47decc054f7
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 11:51:03 2011 -0500

    pep8 fixed

commit ec0d1e332c9b011a09916eb3fc38fbff7a3abcac
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 31 11:46:06 2011 -0500

    pep8 fixes

 tools/install_venv.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d36417aa1a1ef94ed34293506c839bdad7168c9e
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:43:38 2011 -0500

    Cleaned up text conflict.

 Authors |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit d7a387e2b7d7a5cf176f281bc33020ea6c1a977d
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 31 12:37:36 2011 -0400

    removing semicolon

commit 617b561cdfebae489857ac686f4e9e8619c34a8a
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:35:13 2011 -0500

    Cleaned up text conflict.

commit a81598e00bb57259f5dc8f781e6b98781ea78345
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

commit 9dd4e61183d16f0d30923f6a8a695c5657d0c63e
Author: Jason Cannavale <jason.cannavale@rackspace.com>
Date:   Tue May 31 11:31:35 2011 -0500

    Cleaned up pep8 errors.

 Authors |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 7f11d3d8b37a3e93fb008d3df9edf240893c9fd9
Merge: 003fd93 f43c28e
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 16:31:32 2011 +0000

    Fixed the APIError typo

commit cf8cf4fe2541bba73c72f980b54126b99c97b4cb
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 files changed, 1 insertions(+), 0 deletions(-)

commit 4a1eaae46326dcb19692ba9b748b1e39e7ab0695
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.

commit 64c8e730b3bea9b7dff454818a2db9d50670a9fc
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.

commit f43c28e7d5be831c3e5cd29609e425159d44a56f
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 21:04:01 2011 +0530

    Added myself to Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 221da3a835d2308322ba9b8def431532165d74dd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 08:26:11 2011 -0700

    edits based on ed's feedback

commit 4c999060ac7b150edf6627280cbd7d007fdac137
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue May 31 11:17:35 2011 -0400

    More specific error messages for resize requests.

commit c405f3cff75a4ad31a41a5d7252a774a0e2676d1
Author: Cory Wright <corywright@gmail.com>
Date:   Tue May 31 09:51:20 2011 -0400

    pep8 fixes

commit ae1a960b3249ccfbbbbb4604f15cf2e55d44648c
Merge: 5e6c020 003fd93
Author: Cory Wright <corywright@gmail.com>
Date:   Tue May 31 09:40:01 2011 -0400

    merge trunk

commit 84ea45dafe9e849bbcd68bdc8aad6768ff05d681
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 31 06:29:38 2011 -0700

    tests passing again

commit f3c799a5136285d3f32aac346d5893c2a31d87e2
Author: Dan Prince <dan.prince@rackspace.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.

commit a664debce1b4c908e77dcbff2de161f5d2c6d61f
Merge: 8fc47cd 003fd93
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 31 08:16:11 2011 -0400

    merge from trunk

commit 003fd932523d0361024875c161bb0f53ca2deef8
Merge: e3a06da 0d272a3
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 b67000b5ab77bbe1461d8fdc1ed1326009b303a9
Author: Vivek YS vivek.ys@gmail.com <>
Date:   Tue May 31 09:49:06 2011 +0530

    Fixed the typo of APIError with ApiError

commit e3a06da5d3548e2a590719c22e2fc87fea67e9be
Merge: 8ba285a 8b79cd5
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Tue May 31 04:15:45 2011 +0000

    nova/auth/novarc.template: Changed NOVA_KEY_DIR to allow symlink support

commit ef1b3cc00ab28800364b6129979cafe7b91f2afc
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 30 22:47:10 2011 -0400

    Updated compute api and manager to support image_refs in rebuild.

commit 485c440ac35b2e177d04eb4098558ef613870580
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 16:18:11 2011 -0700

    zone-boot working

commit e85d65df9b6bf1da6e4980df771d9a24672a06dd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 15:38:45 2011 -0700

    regular boot working again

commit 2a71c0b05d584f8e9b19125e5a4a67600df20956
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 15:38:29 2011 -0700

    regular boot working again

commit c522be018efa278688042778a1f32a994abf0bb7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 11:02:55 2011 -0700

    first pass at reservation id support

commit 0ae60968d17f1f5d5efae73d23bc61c2f92bb467
Author: Dan Prince <dan.prince@rackspace.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.

commit 8821db4805da2699a2a191c40cd4d37845b50595
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 05:03:45 2011 -0700

    first cut complete

commit a024b948a0cfc8b44070b1092d01f5e31c6d2294
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon May 30 11:30:22 2011 +0400

    project_id moved to be last

commit 2dced9b3b8160b94dc5154574ad0fec1e3daf1f6
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Mon May 30 11:25:21 2011 +0400

    add support for keyword arguments

commit 48450428daa483aa77ce3145dccb70b6a8c96a42
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

commit e8f722eefac41a11502a6860211100b25aea3163
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 00:45:15 2011 -0300

    reservation_id's done

commit 78c00285ccd5d0ac68e2d5576afe8931d3c9698c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 30 00:00:28 2011 -0300

    basic flow done

commit 7aca831b5fa8a05084c441e79925f3c7405c232e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun May 29 23:42:46 2011 -0300

    lots more

commit d927c4a9a1c67a8adb086eb03e1023f8c90ac148
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun May 29 18:01:46 2011 -0700

    starting

commit 660a1db8ff87238020de00ff1c94bc72d10e48eb
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)

commit de425faee97a314f0abda6c21cfb7d5c60d37c99
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sun May 29 07:51:44 2011 -0400

    Use metadata variable when calling _metadata_refs.

commit 65d40e65453c235df9d2f0ecb7f93e8053b61155
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sun May 29 00:00:02 2011 -0400

    Implement the v1.1 style resize action with support for flavorRef.

commit af262ca468ffc9f8884bf594108c5e761e8be226
Author: Dan Prince <dan.prince@rackspace.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.

commit 19e907d022b93398e8bd78d8377865d73f11b7ac
Author: Dan Prince <dan.prince@rackspace.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.

commit a2ed2b721870b88a5f52566d5aeea8646257dcea
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat May 28 21:10:57 2011 -0400

    Cleanup instances_path in test_libvirt test_spawn_with_network_info test.

commit ec6c96fe85ddee90631465c138fcf13da865488b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat May 28 14:18:25 2011 -0400

    Added missing nova import to image/__init__.py.

commit dfd121ffe7413dec8921b8d7446d523503c710ee
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat May 28 07:49:31 2011 -0400

    Another image_id location in hyperv.

commit d25263d0e3f17c753613c790b7399b4a954384c7
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.

commit 7fb28fcb202bdb1a13b708e794cbf8af521420cb
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.

commit 4da0981aa9e3c49355a7f99466043669f07496c2
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 28 04:29:35 2011 -0400

    Fixing integration tests by correctly stubbing image service.

commit b06f004e0a92629751d14735bfe31a64fcd71365
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.

commit 8ba285a9c410d9f3af5447be00b15bb26f783c51
Merge: d6d741f 581c79b
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 d6d741fd63e26c97e127c305cd911718c9c9f6ca
Merge: f6f3054 1eb1d70
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 581c79b81bf73549f71fa9924f97c59da0cb9226
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 20:48:57 2011 +0000

    added \n is not needed with -A

commit 1eb1d70d977a0891c4899fc769e110ded7ffc963
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 files changed, 1 insertions(+), 2 deletions(-)

commit 7051e3bf44670422d6b5772b4b5bb7c54107344f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 20:29:48 2011 +0000

    added -A back in to pass to openssl

commit 5e04b211fa0d4c69116f80d7bccb8852bf8c3c69
Merge: 0d5a0de ceefe52
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 15:01:03 2011 -0500

    merge with dietz

commit 31c3dd80395eb751c479679c431b0950effbc168
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 15:01:03 2011 -0500

    merge with dietz

commit ceefe521302b1350d418b112830453297faa3095
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri May 27 14:59:04 2011 -0500

    XenAPI tests pass

commit 62dde4b72296c55f7e586cf3c5f78c7defe616e3
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

commit aca075ad3e1295195e9cd3fa27596845541047fb
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri May 27 15:48:40 2011 -0400

    Glance client updates for xenapi and vmware API to work with image refs.

commit 2010fe7b163f391e337698e2739e12759cd207ae
Merge: 8fbd484 7381435
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 27 19:42:57 2011 +0000

    Merged lp:~rackspace-titan/nova/lp788979

commit 0d5a0de4b554e9d3f1fe132d7bec5185298de8fb
Author: Jason Kölker <jason@koelker.net>
Date:   Fri May 27 13:33:17 2011 -0500

    get the right args

commit 3eaa3a404e7430bd8f9cd71ec57a698bcc9fe8a5
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 14:29:23 2011 -0400

    Fixing pep8 problems

commit a5c5d134bef047105b4cf4a0885af8c35cd92e57
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 14:20:08 2011 -0400

    Modified instance_type_create to take metadata

commit 1844d3030446572d0bf1020eb0021ec71a9a3c38
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:54:19 2011 -0400

    Added test for instance type metadata create

commit 58e4355516570de8f4226b4460a28590657d57d5
Merge: 4e3233c b833019
Author: Jason Koelker <jason@koelker.net>
Date:   Fri May 27 12:45:59 2011 -0500

    merge with trey

commit 9f290e01afffc44e758a7470c79fc2a0e3177007
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:44:40 2011 -0400

    Added test for instance type metadata update

commit 5e5a979fc358464efc0034d2a70e45a309841c34
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:39:37 2011 -0400

    Added delete instance metadata unit test

commit c37712acfd6015b393ee59c4ac80638fe2ac2433
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:29:51 2011 -0400

    Added a unit test

commit 83ed9d2f04cf0a9d8976257aee3c0af01870df5b
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:10:19 2011 -0400

    Adding test code

commit 5b0f800b07d6d3c1407ab75a0a00f2777d5a79ef
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:03:57 2011 -0400

    Changed metadata to meta to avoid sqlalchemy collision

commit d3db5c9e5fa1de8fb5f6f72c639a9563d4123377
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 27 13:03:36 2011 -0400

    Adding accessor methods for instance type metadata

commit 7381435b9be7e37027eb55284d71fb2e0aa13f59
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 10:41:12 2011 -0400

    remove errant print statement

commit c2bfe34e6135d0d7f0366f52783d0081c222bf30
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 27 10:40:50 2011 -0400

    prevent encryption from adding newlines on long messages

commit 29e58beba82efc2edd68a9333ce12a81aa6d7790
Merge: e332efe f6f3054
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 07:31:29 2011 -0700

    trunk merge

commit 8b79cd595e1854e262b89c75f7a3f418bdd699e2
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Fri May 27 15:28:10 2011 +0100

    nova/auth/novarc.template: Changed NOVA_KEY_DIR to allow symlink support

commit e332efe5754939a317437b764a865e1f145dd774
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 07:24:02 2011 -0700

    docstrings again and import ordering

commit 9f11746ac24011b65de12788f1d8573b6c3bfed7
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

commit 75a4c3bf77e0b5ee71784af860d159f60ec2b695
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri May 27 09:43:10 2011 -0400

    Libvirt updates for image_ref.

commit 1aa2e7fad3a5971b3e1a133b163b24a499d2f5c4
Merge: 7a17b0b f6f3054
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri May 27 09:18:02 2011 -0400

    Merge w/ trunk.

commit 7a17b0b9cd74167a2614679aee60c1b9a0011171
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri May 27 08:15:56 2011 -0400

    Commit the migration script.

commit e33734a113e7a4630aad5ba9a918c5aa2929f912
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 27 05:01:42 2011 -0700

    fixed docstrings and general tidying

commit 19509b81f37abd02bade01ec98d78ee7a8d929fd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri May 27 16:03:56 2011 +0900

    remove _take_action_to_instance

commit 8fbd4845c84d70a6282aed44618bd7f727f27797
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.

commit 9d45486466015700b0ab37afccbfe3d855d3e4bd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri May 27 15:14:16 2011 +0900

    fixed read_only check

commit 4a77448c6c8116275787b24c1e3a42c1ab22d742
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 14:13:17 2011 +0900

    Fix pep8 errors.

commit cf1e509f5fab31ed2bae8b80e3167fc1696b971c
Merge: c74e594 0d272a3
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:50:20 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit 0d272a3d2581db5a0c484d512fffaa78f49a8c50
Merge: de7c567 f6f3054
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:37:39 2011 +0900

    Merge trunk

commit de7c56722f1ccda340d7748d4615f9120de826d0
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:36:59 2011 +0900

    Fix pep8 violations.

commit 99b6bf8ce5e9d963b0e7fc349e0bd3e28d5caeb2
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 27 13:20:45 2011 +0900

    Fix a description of 'snapshot_name_template'.

commit a3897af47de3a6501e457b32cfdec41b7b362b0b
Merge: 947cc9e f6f3054
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri May 27 11:29:21 2011 +0900

    Merge from nova trunk

commit 947cc9ed12036ebcd8303998b311b618d07764fc
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.

commit fd85678d21509e01c3caf3ccb2db6d3b908b68f8
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

commit 85782b94af52f815823e30fe0d79744778a7d463
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.

commit 9efd53056bde0d398fd363178049e453bb08c7ce
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.

commit cfca4f38f39db67ae29b17a4e99d80b7af46cd89
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.

commit 8f8be3ea4ef121b4627ab41dcc7a63d4763feb15
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()

commit 8e3a48c1b80c9b27ed4509365331cec3f2a94e06
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.

commit 078178a16705f35acb64efb6c6a017493867d6e4
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.

commit 7708a6c2c82da3b4afa4c0157bc06770fc6e70d2
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.

commit f6f30545ef62625db3dbfa86345e7099dc01880c
Merge: d38618f 3afd9c0
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 3afd9c0a79c63ddcb0a640d3dd55bc57cd0dc8ea
Author: termie <code@term.ie>
Date:   Thu May 26 17:06:52 2011 -0700

    fix a minor bug unrelated to this change

commit b833019b9264386ea2081917b16d47dee48d70e2
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

commit 12cf9a64ad77f6a447c11da9095e8bb795077bc5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 26 18:14:38 2011 -0400

    Rename instances.image_id to instances.image_ref.

commit 9452e11e4e79330931ecdcfbd2d1a91753be0e2c
Author: termie <code@term.ie>
Date:   Thu May 26 15:08:53 2011 -0700

    changes per review

commit 4e3233ca1a9736d38c4c7676c2cf821487084de2
Merge: 9f35b0f 7e12ced
Author: Jason Koelker <jason@koelker.net>
Date:   Thu May 26 16:38:33 2011 -0500

    merge with dietz

commit 9f35b0f989020ca1c64f18a5899d961cfc4c1f24
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 16:36:49 2011 -0500

    stub out passing the network

commit 7e12cedc75d3f9b17a63e94255104bda660a549a
Merge: 1eacad4 7b5fd29
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 26 16:33:53 2011 -0500

    Merge from koelker

commit 1eacad4a70c3fb006b785527485f844876d085dc
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

commit ad886d0deaa66582fa6f90d5374f991b01e0d950
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 17:27:48 2011 -0400

    adding TODOs per dabo's review

commit 93a5fc899cb0085738e1163bcc54119880a12a07
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 17:05:55 2011 -0400

    Fixes from Ed Leafe's review suggestions.

commit 5e6c0201d9f4d7e4497715b3ac6fd4d1643f9d6a
Merge: 52fc057 d38618f
Author: Cory Wright <corywright@gmail.com>
Date:   Thu May 26 16:58:40 2011 -0400

    merge trunk

commit 52fc05718c7e92e778ce781539bcd52ec94571e9
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

commit d38618f7354a98f4d59839a9b1e6dd7650892d84
Merge: 8264b21 a21616e
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 a21616eb81dcb2207c3191426ff1a3b657b6a138
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

commit 7b5fd295650f2e011c60ea7a2fb9fea13605d4c4
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 15:17:20 2011 -0500

    make the fakes be the correct

commit ec8f959949ef711196a246c2a8273d2792b33316
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

commit bc8a366cfcd364a38275d797a2c6bcc29b773a8d
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

commit 68cbd690ac214f61f8b57b225217f0213e57830b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 19:37:51 2011 +0000

    fix image_path in glance plugin

commit d5f44c3615b764dc581d9a9392a8184696ccd35a
Merge: 914e9c2 8264b21
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu May 26 19:30:23 2011 +0000

    Merged trunk

commit 1979c8ca757727f3d6727bd28543a7972a2667a6
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 14:27:47 2011 -0500

    skip the network tests for now

commit 914e9c224e5d6516c0a3517e16981541feebca27
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

commit 4bc4121f9ca8b7dc96d5f799cd77648597f2f53b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 15:01:24 2011 -0400

    cleaning up getattr calls with default param

commit 4702bcb0a18775fab9208421af3d1517bbe8c33b
Merge: a2b7cb2 64b8c58
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 12:00:15 2011 -0700

    branch 2a merge (including trunk)

commit 64b8c58d661ef39633be8d970f10b232acf989c8
Merge: 4745fb5 8264b21
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:52:42 2011 -0700

    trunk merge

commit a2b7cb247b39046f3ed7290c721814d70c94a86a
Merge: c135529 4745fb5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:47:37 2011 -0700

    remerged with 2a

commit c135529d91769f84253a742b4c5d457e55679c05
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 11:34:53 2011 -0700

    tests pass and pep8'ed

commit f7a452588873e278483c620268095d0f53e6a173
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 14:09:59 2011 -0400

    review fixups

commit 4243f466ccc0d5586f6d8815ba69722a3194c321
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 26 13:59:25 2011 -0400

    Expanded tests

commit 8264b2151161c1c129ef2998afcdb9d8616b2777
Merge: 4d2a0d3 ec0a493
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 4745fb5cdb3095cdce5408d3f3890f9e67e77a61
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 10:53:48 2011 -0700

    missed a driver reference

commit 85f1a7b84803b0a083d39b3c795c8b89e7292c7c
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

commit 08fa3319554edfc7a08086eb2b821a0f6d490920
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu May 26 10:28:22 2011 -0700

    log upload errors

commit b48b969162a921624931683f58411cd22f1cdbed
Author: John Tran <jtran@attinteractive.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

commit b83db97527c343687e28507f705d2b0c60a99b00
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

commit c589a693cb20ceb0bcafbde1a3c172f2ef55ee0e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 12:48:07 2011 -0400

    Test tweaks.

commit a34632a8cfda8a570784089034a0450107d1908c
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

commit 07a0eabd68d9a8ed39cd95634ba8fbfc847c1d6b
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.

commit db5adba9a5a000ba9dfe7b5dbfa36ba8d70969da
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 26 11:07:35 2011 -0500

    use the skip decorator rather than comment out

commit 09b7a19d46b1fa5cce3b2994246669d676fbad0c
Merge: e596fa5 4d2a0d3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 26 12:06:54 2011 -0400

    merging trunk

commit 100fadd604fe523aa8a4cdeeebe5b06dea0160cd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 26 11:03:36 2011 -0500

    Adding some pluralization

commit 54c14ffeabed87c63f2255abe68480f1a23bbd23
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:53:25 2011 -0400

    Double quotes are ugly #3.

commit 647036c49090f1391853a82c1c73c7e421057c4a
Merge: ed92b51 249469e
Author: Jason Koelker <jason@koelker.net>
Date:   Thu May 26 10:46:20 2011 -0500

    merge with dietz

commit 6c68cb1af4e1f1785a9c2a0bc87a344797995e69
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:45:46 2011 -0400

    fix typo introduced during merge conflict resolution.

commit a8e2312ed0b225ef260daa5e4d28391453a44bf3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:44:18 2011 -0400

    Remove spurious newline at end of file.

commit 023b3dc89d3f80d1dbd85289966721477ffdc8d3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:40:08 2011 -0400

    Move migration to fix ordering.

commit 4b069d115e660c03a4e727cedc61197cab17eae5
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:39:03 2011 -0400

    remove dead/duplicate code.

commit 58e9b7f4b62d07887340ce18bb0972a78809d345
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:36:45 2011 -0400

    Double quotes are ugly #2.

commit 66a62c50add4e662f906435ba15575b7f31543af
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:35:58 2011 -0400

    Double quotes are ugly.

commit 90b7963c1ccd4cc8eeb810ce93d2484a811e8073
Merge: b11fef9 4d2a0d3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu May 26 11:30:07 2011 -0400

    Merge trunk.

commit a7a80304fe6608bd296044133e0134c1bca27d42
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 26 08:28:57 2011 -0700

    refactoring compute.api.create()

commit 2dd04033de1a90549b18c39c5b743656a4d5147f
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 26 11:21:28 2011 -0400

    Fix test_cloud tests.

commit c31342a4e837b76cb9381c5c3bc646b62d182499
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 26 10:54:46 2011 -0400

    Restricted image filtering by name and status only

commit 2414cd4f66117032da13c875570c5a8082ca900c
Author: Dan Prince <dan.prince@rackspace.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.

commit 30a061d8d73db6bda80928a1183a2fa218ed345b
Merge: 9ecf81c 4d2a0d3
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 26 10:32:58 2011 -0400

    Merge w/ trunk.

commit 8c670dd6d8b30c2198e1d6ca5e563fef58897a7f
Author: Dan Prince <dan.prince@rackspace.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.

commit 52a6ccd9abb539f822cbe26effb5e1b247d12981
Merge: a0e6867 4d2a0d3
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 26 09:05:14 2011 -0400

    Merge w/ trunk.

commit baea53d25055135314166102a346a859fa3f115c
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

commit 3e3416caba009466aa29cb3893f3be56c720870a
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

commit 831df6bf337e57697b1a2ed36a2c5cdce2cf9806
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

commit ec0a493407272e20bab2efa419985065e74db84b
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

commit 9ecf81c0bb5deb610607f641c6f3667aa5b61945
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.

commit 249469eb5b99f5f9042ea2f1db237bdebdeac5f8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 25 17:49:38 2011 -0500

    Added test skipper class

commit 8a8fbfbd0c5eb66eecebcf401ded9f99463b630c
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    change the behavior of calling a multicall

commit c265c8e17ba7117ec354a4fd38aa308a8ceb380c
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    move consumerset killing into stop

commit 5655bf636c6e87b90793dc9fcc87a06721e6ed13
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    don't put connection back in pool

commit dd4f54640e168b0f11d3c8eea4dea078338509d7
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    replace removed import

commit 7325a1f979c7e530697a7b66e116b6a543cbb92c
Author: termie <code@term.ie>
Date:   Wed May 25 15:43:04 2011 -0700

    cleanups

commit cedf849bac7b57f26db02519bf5b6fbe1314be31
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:49 2011 -0700

    cleanup the code for merging

 run_tests.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit c99bd6a210380dbcbf4bee9a51c436d524bf1b10
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

commit 18bd344ca10d5099a6c76c7f06a9af795cedc1f9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 25 15:42:24 2011 -0700

    lots of fixes for rpc and extra imports

commit 29af90c86dccd45a53643a6228c3809a031a2dfa
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    don't need to use a separate connection

commit 9564efe63f958c3399875516b89df1fcb2c0d2b2
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    almost everything working with fake_rabbit

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 4f4fb1205e19916310de85f4adb106531cbc0280
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    bring back commits lost in merge

commit 824cbe61ae35b8ef4b941f32abd4a82b7a700742
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    connection pool tests and make the pool LIFO

commit 1f572740c2018782a06e2ce8bb2e790240d463bb
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

commit 51683be1a5db4f1ebe6b2c57f1e1ce3d8bfaf147
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

commit 5168c5aeb63dd79e3c6e5773b7ab65e99ecb88b4
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    catch greenlet.GreenletExit when shutting service down

commit b8a98381d1540c57dc06144b097af685c0b2431f
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

commit 29930ea0bbab3f72ef6120c89a7bab4b9fa6d698
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..

commit 88b1a3c944c207239a4bf274d55322816f0eb9c7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    convert fanout_cast to ConnectionPool

commit 16471ca416db6031a4eff887097fdca4039c41e0
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 15:42:24 2011 -0700

    pep8 and comment fixes

commit 425b42191fcfa8bcd6212f383389baca3412863b
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.

commit 6388477b69d597aca49cdc1459efffac17b087d5
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    add commented out unworking code for yield-based returns

commit cc73206bbaf4e01f1e879168d791d8b1f91ffba3
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    make the test more expicit

commit 3a56e8ae825fdf091054c420d3a9fff6d24cc292
Author: termie <code@term.ie>
Date:   Wed May 25 15:42:24 2011 -0700

    add support to rpc for multicall

commit ed92b51e836d598b5c0425dfc8eac34911ab84ac
Merge: 82e00f3 b0d77d8
Author: Jason Koelker <jason@koelker.net>
Date:   Wed May 25 17:15:31 2011 -0500

    merge with dietz

commit b0d77d8adab18201e95841dcc6df0acbd58ea19f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 25 16:37:39 2011 -0500

    Fixing divergence

commit 84f48b5570e3d77cef39045085b106e4b9853a19
Merge: 615c9f5 4d2a0d3
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 17:36:51 2011 -0400

    Merged trunk

commit 615c9f58d7938d7452c30d24cfebe112757baf27
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 17:28:10 2011 -0400

    Added params to local and base image service

commit 4d2a0d3c3052385765641de55b6298cdd9866439
Merge: 1b04e0e 2fd6a63
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 2fd6a63acd8d533fe7b13a75f0c0a2a473df24d1
Merge: 8bad21d 1b04e0e
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 16:58:40 2011 -0400

    Merged trunk and resolved conflicts

commit a8959989a101edd75a10942f77b38cd6a7b452b6
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 16:58:12 2011 -0400

    Fixed a typo

commit 82e00f39a880b8b90e16f61beba1b727a6c3e08d
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 15:55:27 2011 -0500

    make the test work

commit 0af637d1c83e9e3d5f4f2bbbaae1fa66798a0517
Merge: a49d887 1b04e0e
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Thu May 26 00:51:14 2011 +0400

    Merged with trunk

commit 1b04e0e1d87cfdf84191304bdf6402801e251a47
Merge: d9b200b f5aec4e
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 d9b200ba055591ddf442283a8d27652a764ddc3a
Merge: 2939d88 4ddd10d
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 9eaf78970e502f44981b47eb9991e8a29a841aa8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 13:20:34 2011 -0700

    starting breakdown of nova.compute.api.create()

commit 4ddd10d530dc354c1be326ca7f097ec4ed01c76b
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

commit c2dad17b958d51fdb7e33e55489a5dcb539a4a15
Merge: d833dc3 2939d88
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 16:02:09 2011 -0400

    Merged upstream

commit f5aec4e6ece0464248bc9cb05dbfbdac57cc355b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 25 15:51:47 2011 -0400

    pep8 fixes

commit d833dc36f0b3b80467049c508fa928018f2ab124
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 15:48:03 2011 -0400

    Initial tests

commit f86c404ac0995d0135fbc7c6d67c906be85408e5
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 19:05:20 2011 +0000

    fix forever looping on a password reset API call

commit d01bdb54c8c428d8d03709c0cddc482f94ccdb4d
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.

commit 9b01ada2f2b9990c2499101e39e8c74fd810d407
Merge: a27b856 2939d88
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 17:02:45 2011 +0000

    merged trunk

commit a27b8562050a5088ee5c74ef6d8058f50d0690ec
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

commit accba4bb88db1b3a8dd9a0f1c1a9ddbbb7a81bd7
Merge: 5a25f1e 2939d88
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 16:57:44 2011 +0000

    Merged trunk

commit 5279872bcb0dee46599878b320b0d5dc8ed16402
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:36:17 2011 -0500

    remove my print

commit 12b4263da57bf1d62cd1f2e7c64cb2098337e06d
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:34:29 2011 -0500

    we're getting a list of tuples now'

commit 1e8bf3347917ee53d0fdce8ac03da40317ebc4c9
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

commit ecbc4da414f58aca86d46577847e9fff835c714c
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 12:29:23 2011 -0400

    pep8 fixes

commit 71d140b956b79ec5f1f5f2d0508fde426bfd588c
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 11:24:44 2011 -0500

    return the result of the function

commit ac622ec8aad407c3ae03f3a119ff34deb36a23b1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 12:24:27 2011 -0400

    Updated tests to use mox
    pep8

commit f726a9d153650f2cf4727d8d2dea5af5bd45e297
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 12:19:52 2011 -0400

    InstanceTypesMetadata is now registered

commit ae3bf22e4ecd4a60a81a4d7953dd6d7bf514ad62
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

commit 12944a9d3d17c4855439bf17740fe1d89e10bcc9
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 12:15:58 2011 -0400

    Fixing the InstanceTypesMetadata table definition

commit c6cf2118321618b2f795917fa9f2250021155d72
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 25 12:09:53 2011 -0400

    try out mox for testing image request filters

commit 456a30f368f94ba19a42b0b7e9f5088f98da069e
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 12:07:40 2011 -0400

    Adding the migrate code to add the new table

commit cf36cb7413878c5347fc7c9b1d7eb19d95f2d882
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 09:00:13 2011 -0700

    dist-sched-2a merge

commit 2939d88a86d74b2fa8e58d052e3bfbb706bd1cc5
Merge: f8d949f bc22e02
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 d9a7e9425c841b99f3d8710f012ac7a25a24daa4
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 25 10:51:55 2011 -0500

    make the column name correct

commit f8d949f7a6f7fb321bb618e71fbf66c469bf59bd
Merge: b971265 fee18b9
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 ef6c6756be9f886a9c3a12dc484fd2dc2e71c69a
Merge: fb04e9a 36b3df9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:42:58 2011 -0700

    merge against 2a

commit 36b3df993c479b43c0f896d8dbe7af200144717f
Merge: d92c7bc b971265
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:22:51 2011 -0700

    trunk merge

commit 8fc47cdd34fd285f337a11cefb92b253a0f8f84b
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

commit fb04e9addf9ab7363eaa3694148a8a59011624e6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 25 08:17:50 2011 -0700

    New tests added

commit fee18b9f874644902b3cf830e8066dd3a3769b62
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

commit 80ea81a9f25386569e35b98c3149c93c53ca5b83
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Wed May 25 09:35:35 2011 -0400

    Added model for InstanceTypeMetadata

commit 655c9ba722dbbe24f926d0eb41974ac83b6bf664
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed May 25 09:33:51 2011 -0400

    Added test

commit c74e5944ddb302157b7fec43a550e2695685fb48
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 18:02:07 2011 +0900

    Avoid wildcard import.

commit 57df11de7e101d97dd7e2b6a2bb34c3a57c59346
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 17:51:30 2011 +0900

    Add unittests for cloning volumes.

commit 18283701d8d03408f4fe7734fe4c5c9567943aad
Merge: 108900f b971265
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed May 25 17:09:42 2011 +0900

    merged recent trunk

commit 108900f10275f9ce4bf93d82170e3e7a59a3a535
Merge: f716534 da23c2f
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed May 25 17:03:14 2011 +0900

    merged recent trunk

commit 9bd7b12adec4d20dd648db5d365fc50a175d18c6
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.

commit 7cd63a0891e4340a93ded60ee0aa9460519e562b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 25 03:29:16 2011 -0400

    Don't need to import json.

commit ab906e1c7d68cd71850566ed2f925062374e50c6
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 16:27:28 2011 +0900

    Fix wrong call of the volume api create()

commit ebfa07cb8fd82f57385c067c6656d7ea26c8c61b
Merge: 8875c41 b2936d6
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed May 25 03:18:00 2011 -0400

    Merge from trunk.

commit b4f3b7735954313b87345f674be07e679d433b03
Merge: 77cddfb 677bfc6
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 15:57:58 2011 +0900

    Merge lp:~yamahata/nova/volume-clone

commit 77cddfb5f1103d31d35b4d0a88a5d181c47c8d34
Merge: 2531765 5b8ec9a
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed May 25 15:46:19 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit 9c7013dd0083862e7cfcc4b76bdad4abf4a3e4af
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed May 25 04:48:00 2011 +0000

    pep8 fix in nova/compute/api.py

commit 22c1c8f2208bac20d63f300a05e009ee9ed59073
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.

commit 7ff4a453481a76ec17160b5efa4b9acea81575e2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 18:09:25 2011 -0700

    tests working again

commit b9712654c24be2514a9d145e3bcae226ddfe4471
Merge: a4fe2a9 55b05ee
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 55b05eed0be3304a2d6a5f8091c06610f8d3dad2
Merge: 52f05bf a4fe2a9
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 24 22:51:29 2011 +0000

    Merge with trunk

commit 52f05bfc69d9bbb8bb8833757524925ca7fe5583
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

commit 5a25f1e5ead119a94eaf1cc476187518b6834757
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 22:39:16 2011 +0000

    move devices back

commit a4fe2a9c662b85f073ae9ac6bf46ab73e3d065e7
Merge: 9400bde 04a8fcd
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 9400bde2976a7c74e778c91a9952635ff0ce151d
Merge: 1f9423c c403835
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 c403835c5d77cb7cecee54cbe7acbf34b635a912
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

commit bed3243d51d97922f29769528430552137a356dd
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue May 24 21:41:44 2011 +0000

    need to strip newline from openssl stdout data

commit 0f800cb89e7cd872d3a918d886de770ef1bf0fbc
Merge: dc0993e e7fe593
Author: Jason Koelker <jason@koelker.net>
Date:   Tue May 24 16:40:24 2011 -0500

    merge with trey

commit dc0993e069ab68b6f44ff30c19e9d1dc317cf36e
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 16:25:04 2011 -0500

    work on

commit e7fe59373d34509abaa19faff8ea0ca2a03179b4
Merge: 1a37dea 1f9423c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue May 24 16:21:47 2011 -0500

    merge trunk

commit 1a37dea3ff239ddf8f7f42a17d282f4b50e97ccd
Merge: a5ee8b1 ddaa384
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 7465672fe539f0dc205a1ed60c632ffaf52f4d6a
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

commit 4629f0b7ddeaf946c3917acc854f4fcea8e43926
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

commit 9e0c4f28efca66ea15c15326a255733bc33b437b
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

commit 82c846d9913ef327b237cf804a936551299890dc
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:53:09 2011 -0500

    need to return the ref

commit c00c647914ef7f93bd3d3338239a9a52f7d32c12
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 24 16:44:28 2011 -0400

    Added filtering on image properties

commit 1f9423ca54dcc39a289006954abcc2b2d5826a47
Merge: 26a1ad4 b386d3a
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 6781b7b303d75e9deebb1dbbd33a2c68871275a4
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:30:35 2011 -0500

    no use mac

commit bbd6bea4163b6fc94367f8d5673c19ef10ccd6dc
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:27:25 2011 -0500

    comment out the direct cloud case

commit b386d3a01b4effce39ef8880ee2749e491b2f625
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    make fake_flags set defaults instead of runtime values

commit 63f1ede5170409ab11e69002f40a1a9d8f425d58
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    add a test from vish and fix the issues

commit 99c1159830c38cbc381a78646154b879d4d16afc
Author: termie <code@term.ie>
Date:   Tue May 24 13:19:09 2011 -0700

    Properly reparse flags when adding dynamic flags

commit fca39facc9935c75caa59739688f0427cc1f68b7
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:17:38 2011 -0500

    no use mac

commit 4b869b0511c836a47208cc1f5de0488e02de09a2
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

commit c56fc0c1bc5cbfd62bcc4e4fefda1cac605fba1e
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 15:09:34 2011 -0500

    let the fake driver accept the network info

commit 0b71b9edaf2dd0da8d03dd498e11e04749001a6f
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

commit cc0547396aa8b857ed8dcc938a5601a6764e66e4
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 24 15:16:07 2011 -0400

    initial use of limited_by_marker

commit f031cef4d24b6d8fdbd5b7c69c2d1a7f483ac17f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 12:05:46 2011 -0700

    more fix up

commit 0fad67523ec4f4015873dc0eab86fbe34c11a4be
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 13:22:11 2011 -0500

    many tests pass now

commit 01a7407ffbcf3bc66f2697468b25c64d6cca6b19
Author: Jason Kölker <jason@koelker.net>
Date:   Tue May 24 13:21:53 2011 -0500

    its a dict, not a class

commit 1e121353c4ba3dc3a75ad52d058ba7a43a1a3fbc
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

commit 56c06217263d789c463308b73d5b345529efc735
Author: John Tran <jtran@attinteractive.com>
Date:   Tue May 24 09:43:52 2011 -0700

    specified image_id keyword in exception arg

commit 26a1ad457589fd56c1ed1a584e1f614580b2038e
Merge: f4ebdea 8eaba04
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.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 92bd0e0010f6b8f9257f706f013b84e99c059ff6
Author: John Tran <jtran@attinteractive.com>
Date:   Tue May 24 08:59:02 2011 -0700

    added imageid string to exception, per peer review

commit f4ebdead9993cccea89cce7793b9f91d7776f686
Merge: b2936d6 1baaedf
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 41c4f550fca00d4cf927b11ac75b35153148ab8c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 07:36:32 2011 -0700

    removed most of debugging code

commit 0766744f414ae3de4226c89be7b709e04cc7d1bc
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 24 10:27:26 2011 -0400

    Fixing docstring.

commit bbb79e179c81762e44a2f6a6b496c7659b7c605f
Merge: 4461f8c b2936d6
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Tue May 24 15:04:58 2011 +0100

    Synchronise with Diablo development.

commit 7610cd523461a05f614b6faba73de93010760649
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 24 09:51:21 2011 -0400

    make _make_fixture respect name passed in

commit 81130c1fbb55669eaeb25db3d9aa0798dde3a3e7
Merge: 313ecb0 0b874ce
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:49:02 2011 -0700

    zone1 merge

commit 313ecb08811bca2ee3c1721a8889268a5e321c78
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:46:09 2011 -0700

    sending calls

commit 0b874ce1d9496629c8e146e34455ce6a48ad9cd3
Merge: adb9b87 b034691
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 24 05:45:22 2011 -0700

    accepting calls

commit ee548b9228a1ce228b15207a45a36fabc296a1d8
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.

commit 5da72fb6cf32c5d068ac35b8d3d988c94aeaf3ec
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue May 24 04:08:10 2011 -0400

    Fixing year of copyright.

commit adb9b87fd5ee6da4f44e6f45e8b05abb6a8a4b09
Merge: 41376b3 e933cf3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 22:32:15 2011 -0700

    merge

commit b034691c66111a21b4771f856e0e64755ce69e0a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 22:30:01 2011 -0700

    select partially going through

commit 4bbc6c211008b833f8ce84876f239e18db770130
Merge: d31aaad b2936d6
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 22:48:17 2011 -0400

    merge from trunk

commit d31aaad39e22742761b35a2175358dd463449383
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

commit 3337e135eb85607f71bc48b6ec34ef784877f538
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 21:55:15 2011 -0400

    take out irrelevant TODO

commit 5956c01df1d501d636b96d79b904caf222434759
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 18:46:04 2011 -0500

    blah

commit e54c101a81379adbfe3b6623a61304e072d77764
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 18:20:18 2011 -0500

    uhhh yea

commit 41376b30505a6fd8876c43003da00e0478df50fd
Merge: f5c1550 ee71a99
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 16:19:51 2011 -0700

    local tweaks

commit e933cf38bd707cab016f9931f1ae6d1504f1b38f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 16:19:12 2011 -0700

    getting closer to working select call

commit 42c79d780ad8784d5f7bc9a553c90232961e6734
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

commit 3bd90e905afbb91e21e3901ab565754a67121858
Author: John Tran <jtran@attinteractive.com>
Date:   Mon May 23 14:54:11 2011 -0700

    merged from trunk

commit 5b9207bbb38ecd7dd35956d7e1f156ff60516155
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

commit 3709bb46d97a725afcbb62bc1951eafc9e0c2245
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

commit 0205c1da6c91b48bf1d3545e6aabe59a524d5de0
Merge: 9aac484 b2936d6
Author: John Tran <jtran@attinteractive.com>
Date:   Mon May 23 14:27:56 2011 -0700

    merged from trunk

commit 2a85e0a29f749cb6c511569a8c5a4cb8c27bb126
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.

commit 8eaba04a38f4e6d2618e5452f640c9007d3a9684
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Mon May 23 22:15:41 2011 +0100

    Changed ec2 api dupe key exception log handler info->debug

commit 625a01fa049af2c9d7ff578bed46a5d0c536f272
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Mon May 23 22:15:10 2011 +0100

    Added test case for attempting to create a duplicate keypair

commit 1bed443ea62f1fcc978e572c8a45aee58cc97eb2
Merge: a6517e9 712ebad
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon May 23 16:49:35 2011 -0400

    Removing debug print line

commit a6517e9fdf6bfe10656311f8fe962c10e1127164
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.

commit df808174e873b07bd738636ced114bc9eec59b4b
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 20:42:54 2011 +0000

    cleanup and fixes

commit 712ebadde73a872be2a675ce4a9296ea60996642
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 16:38:30 2011 -0400

    got rid of print statement

commit 52568b7bb6919edb4c9b0661945432e5135c1c33
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon May 23 14:38:37 2011 -0500

    initial fudging in of swap disk

commit 8ae91f376986f1a4b668998996ecf853386d2cb8
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

commit a4d82d0ee991213409e8a78b0dadeada9e5c7e33
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

commit 27ce807a9ade36f0d27450e525af1d5b00d0900a
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

commit 659a4ba8b0de60581821ffdeb405fdf2c3ba2194
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:38:33 2011 -0500

    must have the class defined before referencing it

commit dfc94259148eff425d04eb43d2eaeb6b4aaa83fa
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 13:06:55 2011 -0500

    make the migration run with tests

commit d92c7bc76697010a943b2c042333e352d48fe8b4
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

commit 9518aad31c58d314e7bfd9bff46dcbce425a16b3
Merge: cf85cfe b2936d6
Author: Cory Wright <corywright@gmail.com>
Date:   Mon May 23 11:39:39 2011 -0400

    merge trunk

commit b2936d6e5497c3e5eeecb9b86e1bb2ebd502b9bb
Merge: d7204ea 429a65f
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 e79d269967437ef8362b93e363ea0d1be2ce8d7a
Author: Jason Kölker <jason@koelker.net>
Date:   Mon May 23 10:35:48 2011 -0500

    fix typo

commit 8bad21d845ea1d89526c3d5e79db48bf39e8861f
Merge: 261dc4b d10e92c
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 261dc4ba688c1c7baaf7b9027641d708c70340e6
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 23 11:10:40 2011 -0400

    Added test

commit 1baaedf8c9a21c774e6fce2c0e5c5494d2e39f0e
Author: Anne Gentle <anne@openstack.org>
Date:   Mon May 23 09:39:15 2011 -0500

    Fixes missing space

commit 940f422ff86e740f4f97f6bc3b5fecc08f7c82c1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 23 10:37:28 2011 -0400

    Fixed mistyped line

commit 672fbc1843fc445e003b28741bdf7e2d8eca194d
Merge: 6b95b63 d7204ea
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Mon May 23 23:35:06 2011 +0900

    Rebased to trunk rev 1101.

commit e6e3af1649c2f1550e74ee1cb99d9a7d39b3f831
Merge: 87f41ba d7204ea
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 10:28:42 2011 -0400

    merge from trunk

commit 87f41baeea4dc13e51dcad04a29bd0b6eecc2950
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 23 10:28:04 2011 -0400

    moved utils functions into nova/image/

commit 98dd1d5b018436acc51481dbf0e88d3b4a188889
Merge: 230a192 d7204ea
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 23 05:30:44 2011 -0700

    Trunk merge

commit d7204ea86a215250e8e9da575986d9e6d51a25ce
Merge: e433dc5 65866b0
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 23aeb8696dbd6639162ace94187ec4aae231eea5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sun May 22 03:16:16 2011 -0400

    Removing utils.is_int()

commit 29c227bef52cd3367d4412bc8540d622af67b1c4
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
Date:   Sat May 21 13:00:22 2011 +0100

    Added myself to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1d0f0d0085283b5fe02f2885a6ecf43cc8e7defb
Author: Dave Walker (Daviey) <DaveWalker@ubuntu.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.

commit e433dc50076e0e5ed65acab4e604c95a2c628980
Merge: 58ad2f4 2a30175
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 eb66d711fc36182263fe4ecbfce1690b24a27d0c
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Sat May 21 02:34:27 2011 -0400

    Minor cleanup

commit 389ca8b66d6fc7f48254acd8ded12638bda7ad06
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.

commit 58ad2f44ae436a4e0ed1ad0139aacfd6c5e29548
Merge: 01a5f05 8bc4a4f
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 8bc4a4f286586f7bbc8ff817a2f18a6ad46c2530
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

commit cf85cfecaeff90aed794f40a280af1db0ab83c5a
Merge: 1019291 01a5f05
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 20 21:30:39 2011 +0000

    merge trunk

commit 10192916c36c480af5cf46e9ff00263f589781c1
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

commit 01a5f05f5a7238f64ec425678475f485184be7fc
Merge: 6b119d9 ffb204d
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 e596fa5b7d4e2e52a633e8fc20c61d307a4bdf2a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 16:36:10 2011 -0400

    minor cleanup

commit 6b119d934d305cb54015973f59d47a54d4b8c69e
Merge: bb72092 fdc0f33
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 8e2bc83f40c2213ea7b8fe5ff606d0ad87c1369b
Merge: 363876f bb72092
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 15:29:23 2011 -0400

    merging trunk

commit ffb204d0bd5f8dae0b736b7521d23a4ed37b16d1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 773617402ce632c67f12828583ae967c083c5eb5
Merge: 93a37e7 bb72092
Author: Anne Gentle <anne@openstack.org>
Date:   Fri May 20 14:07:02 2011 -0500

    Merged with trunk

commit 363876f70852b9d2e95fc863e7eab6bbef1ec9d5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri May 20 14:42:19 2011 -0400

    renaming resource_factory to create_resource

commit 3ab34f76dec3555642cb2a33dea8b01433e8df50
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 14:22:58 2011 -0400

    combined the exception catching to eliminate duplication

commit fdc0f331237c99b79a5a117619f55d701a6ca9c2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri May 20 11:21:52 2011 -0700

    synchronize vlan creation

commit bb72092a8d5916c7af4e38f7e3041c800b2dbb5c
Merge: f0a01f0 9ede9e6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri May 20 17:36:14 2011 +0000

    print information about nova-manage project problems

commit bb81ab961894f12f159c297453d329b0706d40d5
Merge: d57b5c7 f0a01f0
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 12:43:02 2011 -0400

    merge from trunk

commit 92011001c2370f327c229e3c5cd35e6ebe898bbf
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 09:09:03 2011 -0700

    fix comments

commit 0e4699ef1e33caafe2491705303bb3bf554c8601
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

commit d57b5c7c2d9a60f61e3d07615141fa73e654945a
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 20 11:50:00 2011 -0400

    fix pep8 issue

commit 9ba70e655acb55d5e0afd3cc8a813d1914e33aaa
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

commit f0a01f0e643b012d574b28f41b9c29c630321123
Merge: ab0310a 8defe2b
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 8defe2bdd4ec3533f533cd8dca1afa3b273c2a9d
Merge: f1d252b ab0310a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 20 10:31:23 2011 -0500

    Merging trunk

commit ab0310a3657d489a5c544b77d750160b1e4a380e
Merge: 6b59233 66c5618
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 6b5923304b65931f4204b0e96441c38742390aa6
Merge: bb6f6a3 05118ee
Author: Dan Prince <dan.prince@rackspace.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 2a301757d866ef571369c63347dd4bebe3126c8f
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit f5c1550947d0c1e0d9e54813c2837c1743c1f2cb
Merge: 73f4a1d ddaa384
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 06:04:58 2011 -0700

    foo

commit ee71a9963b07706e43981a42d5761903e60efc6c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 06:03:43 2011 -0700

    syntax errors

commit 7afeae1bf6c98f4aad6513e106d29a3c34382404
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 20 05:02:34 2011 -0700

    temp fixes

commit 9ede9e6ccfe2397db1f03f139737e1450719b1f7
Merge: d36f58d bb6f6a3
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri May 20 13:29:54 2011 +0400

    Merge and conflict resolving

commit 89a0365db97a04e1af43f80a3d51ed1be7a6bd0f
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Fri May 20 12:53:49 2011 +0400

    added support for reserving certain network for certain project

commit 23917e26c19cfa22e093d694fa337c4c6d0a96a9
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri May 20 04:14:02 2011 -0400

    Fixed some tests.

commit fd0eaa759434b9666b4fcd19a96b72bac0937919
Merge: b593e81 bb6f6a3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri May 20 00:32:14 2011 -0700

    merge with trunk

commit bb6f6a3f4e69b812742ad923769335f24dcd105a
Merge: 1f2c904 5c23e4f
Author: John Tran <jtran@attinteractive.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 1f2c9040cf64f465a5e2892555514e27cc26e6ef
Merge: f8ace18 2746ff9
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 f8ace184f8a819ec839d7434d521ecc925e2af35
Merge: 40fbfdd 0870d00
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 40fbfdd5994b350599d8c5463a79c04b73189a33
Merge: dad43cf 735c185
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 dad43cf2490436a6ac09b9740a61a428d5ec8540
Merge: ddaa384 4600ab9
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 d10e92c9c81d451fa1db2b60a467b69e12f12b86
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

commit 0d7285c69a7476e61be47bd0c962575f60e543f5
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

commit 65866b0bf8c6bdabf225585349add0a3b006e0bc
Merge: 0dba9e3 ddaa384
Author: Justin SB <justin@fathomdb.com>
Date:   Thu May 19 21:03:15 2011 -0700

    Merged with trunk

commit 66c561876f0e715a671ca93fd8d16edfdd8ad625
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 22:56:23 2011 -0400

    fixed pep8 issue

commit c3169ae2b46f6280d3c3d463386be76595a81ac3
Merge: 2ebc353 ddaa384
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 22:55:26 2011 -0400

    merge from trunk

commit 82cb87c4d34c16d7062cb8574d914f93ae76967b
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.

commit b593e81be70f1b4e1f78be1f9da6d17c686ac0ea
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

commit bc22e026b4cc22348008d80c60e9cda5699ee6ce
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 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 1a038e6a2724c5164f754543b38a78f81b370a94
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

commit fd9f0e5a2602f92d9616f1ca7951ac9828eb0b96
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

commit 92fa6c62034e5b562415a6bdefe11087e7eea303
Merge: 081e63a ddaa384
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu May 19 16:04:37 2011 -0400

    Merged trunk and resolved horrible horrible conflicts.

commit bbe64fe8bafaf961086af56303c2e124ee2b0bd0
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.

commit 73f4a1dd325ba19a3b4034c78b2ca42abc2b5a91
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 19 11:17:20 2011 -0700

    temp

commit 70badd7a0fdca810e791320cdbcafb968f8d2754
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 19 14:08:15 2011 -0400

    waldon's naming feedback

commit 93a37e7c73e3c4d43bb444906e2a08b16cc049b8
Author: Anne Gentle <anne@openstack.org>
Date:   Thu May 19 12:17:55 2011 -0500

    Fixing role names to match code

commit f1d252bd77553cacb3d385faea93e8e192aaf0cb
Merge: b485400 ddaa384
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 19 11:01:56 2011 -0500

    Merging trunk

commit a5ee8b17ebea65af9911f2aa961b14d6f5487348
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

commit 3ed87906f30aded6d418ff4a092db66bc4574dca
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 11:29:23 2011 -0400

    fname should have been root_fname

commit 7bbbea571a59ed9c76fc34ea2347ceb8e653e577
Merge: 688beea c6b9460
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 688beeaddffa9f2b9e249265b8515611bfb9bdea
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 19 10:52:23 2011 -0400

    Minor cleanup

commit c6b9460e7e1ba1726ffbd6d697fdb487a6388a0f
Merge: b065855 ddaa384
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 19 09:40:34 2011 -0400

    merge from trunk

commit 5b8ec9a4c7dc7b824adaf3d3d94f70a2564f8bf7
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 22:06:18 2011 +0900

    Fix comments.

commit 365433d5a53235bf20a088144ad236a3a024dfa0
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:49:15 2011 +0900

    Add a unitest to test EC2 snapshot APIs.

commit 00ee7b07aec45aefea83fcc827f769b2cd616834
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:31:14 2011 +0900

    Avoid wildcard import.

commit 48a86cb6da98c0b0caea7e3181ebdd834104db1c
Merge: a5c8ed7 ddaa384
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu May 19 21:29:27 2011 +0900

    Merge trunk

commit ddaa384f6cd73d2c408ada6c4d2cb828ca9e7539
Merge: e52a803 591d35c
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 e79e2ae285f6c0d34b6084dfa6b57e5db2b35da1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed May 18 20:33:52 2011 -0400

    missed the new wsgi test file

commit fcdf9067a32a570a3f476c565b7b5cd788ff4d52
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

commit 750e7b7ca8ee2e64ad9f96f288d40424c7047622
Merge: 9bce505 e52a803
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 18 19:30:58 2011 -0400

    merge lp:nova

commit 9bce505fca2654bd3fc3a04e7f8a3a434cb0f48b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 18 19:22:53 2011 -0400

    fixup absolute limits to latest 1.1 spec

commit 3cf86d0649174c0fd96c0438f9fc005da2e26359
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

commit b065855f86ad1f3afa0ad6ba5ddde90ca6d58faf
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

commit 2c50905989a885b05f1599d3209566d86f3d8305
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 17:57:44 2011 -0400

    return dummy id per vishs suggestion

commit ab914f665ebcc747a1df73cf3a7369ffdd66416a
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?)

commit 591d35c79711b87c45b083a783146f92e8429174
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 18 21:25:35 2011 +0000

    Sort list of controllers/methods before printing

commit 4ee5143f002a9fc35aa0cfa2a4780239d784c7e4
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

commit 1c6931a755e886973e5435e528c534084ba5c764
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

commit ce7e10a75c9eebf8572c1b3bf495dacf56efcc60
Merge: 230a192 09bd456
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 18 14:06:46 2011 -0700

    skeleton of forwarding calls to child zones

commit 4adeaf83351e0934435ad3d339d7c769860a54eb
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 18 20:46:21 2011 +0000

    fix typo in udev rule

commit c4cd92db8e412a5a466c525d7d23f4096c4b2207
Merge: 78afd8a e52a803
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 18 20:40:56 2011 +0000

    merge trunk

commit 0c6beb3cfa244244a82e4cea6b17f9f61d656510
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 16:26:42 2011 -0400

    libvirt fixes to use new image_service stuff

commit b485400cfedfb389c1a86451cc459f6e1d8b1445
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 15:14:24 2011 -0500

    On second thought, removing decorator

commit 979865de78701073c632a59f305a903a52d72a04
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 14:46:39 2011 -0500

    Adding FlagNotSet exception

commit e52a803f4920baced37941d925915ca93c539b19
Merge: dd4b203 effa888
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 effa888d03f202c5eae00f164de9689d645d4383
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 18 12:55:17 2011 -0500

    Spacing changes

commit 6b3ec58cb2de54177a7d1577196ac3d2a9cd7094
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

commit a31af249f8aae6d188f4517d4c4983c1d62a253d
Merge: 5c184ad dd4b203
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 18 12:47:16 2011 -0500

    Merge from trunk

commit dd4b2030083f13aa6452b8462ef3c9582c9c8fa5
Merge: fcbe4fb 21a038c
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 78d68e208e3b1e64f7ce2bf2fcbd457089733564
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

commit c467ce8e0658f4bf011811928fec3ed40c32dd56
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 11:58:45 2011 -0500

    Adding xenhost plugin

commit f0c4be03803ec8bd55d8f4deb43cceedb195053b
Merge: 57152eb fcbe4fb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed May 18 11:56:55 2011 -0500

    Merging trunk

commit 21a038c381d6b8149a141bd68750af7ee79a6dbb
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 18 11:27:39 2011 -0500

    Added missing xenhost plugin.

commit 04a8fcd09f1a99f43d3f6f43c79bb46501529169
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

commit a935963d0e6e05b71c84a82b08731a82f15a1d59
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 11:13:22 2011 -0400

    fix pep8 issues

commit f8d8a8e575a524034eb2c34ee223a9b18f275e93
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

commit 9c00ed8cc41de67cbddebf9a15c7aadbac8a6951
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:45:33 2011 -0400

    fixed api.openstack.test_servers tests...again

commit 57caefb992b8388560c1759dd4e2c4d3f5ac72a5
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:41:33 2011 -0400

    fixed QuotaTestCases

commit d1b170f382be88f60a2fda65e72cbbba205dd0de
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:16:51 2011 -0400

    fixed ComputeTestCase tests

commit 5faf178fa6ded4130e8de98bb8b56a8142ebf2c1
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 10:10:10 2011 -0400

    made ImageControllerWithGlanceServiceTests pass

commit f3851575daa3ecce27a01e9609f04ff36e5dd17c
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 09:52:37 2011 -0400

    fixed test_servers small tests as well

commit f5b96b2fa4828416d8b2da8927b1e975d1d01c94
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 18 09:50:18 2011 -0400

    get integrated server_tests passing

commit 0a2c0376a607628e733e792a75630c029633204b
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().

commit b5886c238d369ac3e0e55990f91672e1fd43fa3b
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

commit 898fffa10f1fd8d43901de47b2178b8b43b214a7
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

commit 86561b0a1df5e4a924c1124b7db1f2d4e2643e2c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:53:00 2011 -0500

    Small cleanups

commit fa8b9196bb4e59cb7c34b083286c478fe9833ac5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:49:21 2011 -0500

    Moving into scheduler subdir and refactoring out common code

commit f737e335f6073bdef1b63c6a1395054c2949ad5f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:32:56 2011 -0500

    Moving tests into scheduler subdirectory

commit 04a731d351981b6b1a95932b939024708b3b6a61
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:30:29 2011 -0400

    added is_int function to utils

commit 847476db6f7dcd1a49919d4dcc28cecc8914bc94
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 18:15:31 2011 -0500

    Pep8 fixes

commit fef50de5d78a45a50ab9f5293b51d2bc10c0ea72
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:14:35 2011 -0400

    made get_image_service calls in servers.py

commit 7ff5958bde67fa336caab173506462ed980795e5
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:10:11 2011 -0400

    use utils.get_image_service in compute_api

commit bee8d03bdea0ad093976a746ef639ca58679b390
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 19:07:44 2011 -0400

    updates to utils methods, initial usage in images.py

commit 3ac1539229e70a8eb720d56b789aaef8049eadc7
Author: William Wolf <throughnothing@gmail.com>
Date:   Tue May 17 18:57:00 2011 -0400

    added util functions to get image service

commit 16b1b289dc290ed81707b6efa8499e78a62d5eaa
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 17:44:08 2011 -0500

    Using import_class to import filter_host driver

commit 3e03dc545c9af01321ee9fb1d2854392c565dcff
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 17:27:04 2011 -0500

    Adding fill first cost function

commit 2e617087ca96fc3b6f6bf8added97ed7a5412afa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 15:14:17 2011 -0700

    add more statuses for ec2 image registration

commit 735c185ce3066ea28e636ea3946604f35e7c6aea
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 22:02:08 2011 +0000

    Add --fixes

commit c1602917be0e10dda2a7a05b7cccf6fc59bd892f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 22:01:08 2011 +0000

    Add --fixes

commit fcbe4fb06391bc045f465f3c7de21c9644e9364e
Merge: 09bd456 8889231
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 cc0fb98904ae5cbeba8eb9051df355796b6931db
Merge: 5236f1b 5c06c67
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 88892317d6a40697bb3aa98de13b0d86f81dccb8
Merge: 9f185ce 09bd456
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 13:50:12 2011 -0700

    merged trunk

commit 9f185ce8d305421e83dfc295aa509b9e62e5f809
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 13:49:51 2011 -0700

    move migration 017 to 018

commit 3c72e56e4fff58f7736d5a53e6ca0f737953beab
Merge: 6558a65 1389004
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 16:28:14 2011 -0400

    merge ram-limits

commit 6558a65a1926fd0bde42b5e5fa4849c5e57dbafb
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 16:25:45 2011 -0400

    Removed extra serialization metadata

commit 09bd456471d7e4aa95454cb6650ab9bffc245e7e
Merge: bff0fda 54dd1b5
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 230a1920b187ce3fcf18fc3aff4859117190341c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 13:01:28 2011 -0700

    pep8

commit bff0fdaa3243a7f9d71e31b94cf233cb2ae4df9f
Merge: 1564207 b9af08f
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 1389004837dfbea099188b20f2adbc0502df403b
Merge: 5892b78 1b9353b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 15:45:22 2011 -0400

    merge ram-limits

commit 5892b78eb5b622a18a534088bc50965b7c080717
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 15:36:00 2011 -0400

    support unlimited quotas in nova-manage and flags

commit 0691a783548637437b90fc9a4c6813e6f15f63bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 12:30:39 2011 -0700

    fix test

commit 77926d822f3d75d936c67739c0ccbad73add423b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue May 17 15:14:52 2011 -0400

    Changed builder to match specs and added test

commit debdc42693b087f9dba353647bbb814cd2118b9d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue May 17 12:12:48 2011 -0700

    add migration for proper name

commit d9f9cab53a1773c4eb963acf8bfe0168bcdc9a01
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

commit 560e4f6b742a665a4efd50503624bef498683635
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

commit 1564207287fbfeb18ff41c94a12033c78c379348
Merge: 1ff37d9 b769ad7
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 17 18:00:24 2011 +0000

    Added missing metadata join to instance_get calls.

commit 532a1a2603626d73610a607cce1753db618fddaf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 17:51:22 2011 +0000

    Avoid using spawn_n to fix LP784132

commit bbf8158f88fe2a83d70e8dcae984ff49502f7ebe
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 13:46:15 2011 -0400

    add ram limits to instance quotas

commit 1ff37d9a2a7e36ac82f94154941c6db581d89320
Merge: 2821ff1 6ec4e5f
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 6526418686dc1c624a8796a87fc577f270d66878
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Tue May 17 16:46:13 2011 +0000

    Set password to one requested in API call

commit 6ec4e5f4b56faeef8431615335baadb9326653ac
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

commit 2821ff156a39e5e18df76642aec6b9813476a06d
Merge: 231e8df 90c1c35
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 231e8dfe3c66b35893072d8d849c77920450798b
Merge: 1da7e54 c822d10
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue May 17 16:15:21 2011 +0000

    Improved error notification in network create

commit de1e3711c44e6b3820bdd9764f57a6f53b2a51c1
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

commit 5236f1b820ca0109ef9d3450e09a0e987c202a44
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue May 17 10:45:19 2011 -0500

    First cut at least cost scheduler

commit 33fdfd7246f3001e269291bc7c35b1b3eac68118
Merge: 5767468 1da7e54
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 17 11:41:58 2011 -0400

    merge lp:nova

commit 1b9353b7ab5cb2657d438a987363f9ff3b344890
Merge: d1bb014 d70a5b1
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 5c06c6759364c0fadd85183d5f4cea1787667a5c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 07:52:02 2011 -0700

    provision_resource no longer returns value

commit 631d144626b3720984dcfcf3d98415e476469f8e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 07:49:12 2011 -0700

    provision working correctly now

commit 6e912a1752c65c117daf544aceb3a1f6ed5d6f43
Merge: 1da7e54 5c184ad
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue May 17 14:19:31 2011 +0000

    Re-pull changed notification branch.

commit 6680aa6a059a6514df6f7fa97a02df654bbe546a
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 17 17:45:48 2011 +0400

    PEP8 fixes.

commit 4600ab9af7e573355a21e95d1c952f98735f65d2
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Tue May 17 08:42:57 2011 -0500

    adding --fixes lp:781429

commit dec2d797e90815f1a21e53adc0695713a4139fdd
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 17 17:39:19 2011 +0400

    Fixed mistyped key, caused huge performance leak.

commit 7191d55985b4929ba042dcd790b5c3d8dba194ff
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)

commit 8bc150a9910fdbf21f9756cf13479804e0be3341
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 05:43:06 2011 -0700

    ugh, fixed again

commit 4d63c1753ab42c3a386d1d5ceebeab8a60d8a180
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 17 05:27:50 2011 -0700

    tests fixed and pep8'ed

commit 05118eea785ec83b936ea8f67af3b4facb9cf2ca
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 16 23:14:51 2011 -0400

    Update comment on RequestExtension class.

commit 0b0dcdad04e85a05194b2d44ccbdfbf777bba5da
Merge: 2ed8694 1da7e54
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 16 23:09:25 2011 -0400

    Merge w/ trunk.

commit 746b15e08fa4cd184fcaa73205a581b8af7a4508
Merge: 460894b 1da7e54
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 6b9297d01e3b07718f1848efc5be015a86d267a2
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 files changed, 6 insertions(+), 1 deletions(-)

commit d4b105e8943accedc9e57aefdd21cfe254f8f444
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.

commit b57714ecddec2ad3812cbb3fa96f51e528a1718f
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 files changed, 1 insertions(+), 0 deletions(-)

commit f12abaab8888d8168c223760f818a05f7854ffad
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon May 16 15:59:01 2011 -0700

    fix for lp783705 - remove nwfilters when instance is terminated

commit 460894b0fdc82897a12b91264f60dee9a2080754
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 16 15:37:25 2011 -0700

    basic call going through

commit b769ad7f75a1eb95b8c6360d1663ad4bb22a38a1
Author: Josh Kearney <josh@jk0.org>
Date:   Mon May 16 17:36:42 2011 -0500

    Added missing metadata join to instance_get calls.

commit 576746862ea622f1adc70b1aca8ea93aa05a41b5
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 16 17:58:07 2011 -0400

    add logging to migration and fix migration version

commit 1da7e549d593740e65fb8555d09c14c88341f9a2
Merge: 1465b75 d1bb014
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 5c184ad68e8ad9e6d5554d36d3af79fccb1f2692
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 15:45:40 2011 -0500

    Conceded :-D

commit ed41f0df60cd8786cf11d497df74eba806b1e67d
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

commit 1465b75759a18e3f531e08f32e563662efc425ae
Merge: bc32467 729ed99
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.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 bc324676602b5698f674afe6a1f39863a598c8e8
Merge: cb0b1e4 57a20e1
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 16 20:30:40 2011 +0000

    Fixed minor pylint errors

commit cb0b1e4373df1cc170c1472a68d1e68149c758f8
Merge: 3afdcf0 54149b4
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 cba799c5fa49c7c1d377854f772d158be64a8b75
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 15:16:34 2011 -0500

    Merge prop changes

commit 54149b4682a752a85a901096473a2d5c0e611326
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 20:06:49 2011 +0000

    Reduce indentation to avoid PEP8 failures

commit bb58efff20b4f5f23f3abdfb82804f875cd01193
Merge: 5630c1c 29ca720
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon May 16 15:01:06 2011 -0500

    merge koelker migration changes

commit 5630c1c5e8b1eb85c1fbf5c7593424c09c6c69a5
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

commit 44af9eae5683478db0da56b5ba30b3ad961083b8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 19:33:18 2011 +0000

    PEP8 cleanups

commit 80c2ef876b10007c105490e2ba03762d6c662d4d
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 18:55:46 2011 +0000

    Use new 3-argument API

commit d70a5b1c6fed61c504576a48a8847d7c2e99d04c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon May 16 14:50:07 2011 -0400

    add a todo

commit d36f58db60988d4b4f2ba0332769504c31a74f99
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 22:40:16 2011 +0400

    style fixing

commit 0bcdaf575eba00e22bd31931786726cd7e419187
Merge: b68ebe9 3afdcf0
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 16 18:14:03 2011 +0000

    Merge with trunk

commit 57a20e11225dd0abcffcbb3bd3560155b5fcb062
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Mon May 16 14:02:56 2011 -0400

    Removed obsolete method and test

commit 3afdcf0778d9f5c15771ff91f02c3958c79009fb
Merge: f156d21 687de1a
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 29ca7207c05a811eded26e75cef921868c7bccdd
Author: Jason Koelker <jason@koelker.net>
Date:   Mon May 16 11:40:42 2011 -0500

    make the migration work like we expect it to

commit 8a5b5427710b10beaa6be943fb6515727d0e2120
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 files changed, 90 insertions(+), 84 deletions(-)

commit 729ed99375a2e7c74d86b8e0bee941c83bcf63c7
Merge: 90c8d89 c744e49
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Mon May 16 11:13:36 2011 -0500

    Merge from trunk

commit 90c8d89d3c7325c39e8dff151f25dd5069ed3080
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Mon May 16 11:12:16 2011 -0500

    Added the imageRef and flavorRef attributes in the xml deserialization

commit 6b95b634e6f7303da64652b858e8777c9a3473d4
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.

commit 05984696ad35ce733d0cc0c4c6fc66302268abf1
Merge: a512767 f156d21
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 16 10:54:02 2011 -0500

    Review changes and merge from trunk

commit 7d08ff3eeda48d588bcc69fd3da7f7d03c14369b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 18:17:15 2011 +0400

    Pep8 cleaning

commit dfdab0501ea3367acb666b69f09aa6250e610eff
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 16 18:14:09 2011 +0400

    Added response about error in nova-manage project operations

commit 9fd8f176aaa7a7db4e861fbb012d065a4bb0acfa
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 files changed, 1 insertions(+), 2 deletions(-)

commit 218365aac8ad502738a34b9a781a1b069efa070a
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 files changed, 2 insertions(+), 0 deletions(-)

commit a5c8ed72846e1378e43b6744c6564449b3dce187
Merge: d60d4b4 f156d21
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Mon May 16 16:30:17 2011 +0900

    Merge trunk

commit d60d4b4ea110bf861d180b3b8aed83053547358e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Mon May 16 16:29:21 2011 +0900

    Add a unit test for snapshot_volume.

commit a49d887be2681b8b9e4b2af1b2598230ea8e8ba7
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.

commit a7111d2582d4ca5a32ac27f953e84b0ff29856ea
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Sun May 15 14:15:37 2011 +0400

    Unit test for snapshotting (creating custom image).

commit 687de1a5a9cc6914289a97203129119f0b25a350
Author: Justin Shepherd <jshepher@rackspace.com>
Date:   Sat May 14 23:00:56 2011 -0500

    fixed a few C0103 errors in test_servers.py

commit 72af34a770b647272b93fa42e3a2158844fb3288
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

commit 78afd8ab17d193ed85f886df654282d2df254ceb
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 21:05:12 2011 +0000

    fix sys.argv requirement

commit 644006f4b78eaf365a0b6fd795a254441094dbd3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 15:36:42 2011 -0500

    first cut at weighted-sum tests

commit f558ab541e221f2e60f5f0eb57765243767f236f
Merge: 3b280a2 f156d21
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 19:29:52 2011 +0000

    merge trunk

commit 3b280a21b128b052ce8dac8db54c41864ede6cb9
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

commit f156d2178fcc23c9efcafd0c7b391b4e45981f77
Merge: 3811a60 a3f0a06
Author: John Tran <jtran@attinteractive.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 1b1605018ac5d1b198633ce6d68f0a23cdcf9da8
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

commit 038d78d0579dd36faf153c75214924f97c04aa6b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 10:43:43 2011 -0700

    started on integrating HostFilter

commit 8089bcfa2a52dc17900e1e8322eb7457de3e1c4d
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Fri May 13 10:26:13 2011 -0700

    Add support for rbd snapshots.

commit 57152eb24dc07639d29ff6178f774a9bf4abdca8
Merge: f260bcb 3811a60
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 12:16:48 2011 -0500

    Merging in trunk

commit 3811a60f0f6c94d4afd3c84166bfbfbd07b330aa
Merge: 07a31bd 4e16f92
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 d1bb01439dd18e28641850fb2d9c32fd9604412e
Merge: 597bae5 34cab9e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 13 12:57:24 2011 -0400

    merge lp:nova

commit 07a31bd0f02c04d4dbd1931bd95aa4c3b5e0a8b1
Merge: 34cab9e e9a73bc
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 e9a73bcc7f5691a424b6b263ebcf1aa019543882
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 13 16:47:18 2011 +0000

    pep8 fixes

commit 6757a320b14f0fcf77343b1daed8ae86b216b72a
Merge: d5f93ab 34cab9e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri May 13 16:45:42 2011 +0000

    Merged trunk

commit c17c11467218b95f8a4497c91044e69370dbe945
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.

commit 34cab9e266d7fe7a7085916c13553ce1cbd94935
Merge: 86eb414 e49dedf
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 16:05:30 2011 +0000

    Make set_admin_password non-blocking to API.

commit e49dedf85924800f420407441ce650d7d5839eb3
Merge: 00c844a 86eb414
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:27:15 2011 -0500

    Merged trunk.

commit 00c844a06d515ce459cabb86ec6b1d270eb6c0f5
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:26:50 2011 -0500

    Review feedback.

commit 86eb414644490f8db27ab0f6569faab2b6084879
Merge: de94fd1 78e2d3e
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 de94fd1f218cb271eb4b1136b5b9ced51459b16c
Merge: d87be2f 896553d
Author: Dan Prince <dan.prince@rackspace.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 f260bcb87fbc3f0878b649e845b6a040120d723e
Merge: 9cd93cf cb854b4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri May 13 10:17:19 2011 -0500

    Merging in Sandy's changes

commit d97dd44263134113013a2c40e0ff20a3b388d69d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 10:04:37 2011 -0500

    Make host timeout configurable.

commit 24fbcf1b816c2662f9861c1c49e5382510b1d372
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 13 09:47:08 2011 -0500

    Make set_admin_password non-blocking to API.

commit 55d7f47bff402fa4e5d8bd85c38b4e2e435e1ac9
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.

commit 1e8d839f97b707f326cfc7c29e6651116157fa92
Merge: 3afa827 d87be2f
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 14:22:49 2011 +0000

    merge trunk

commit 896553dd7711f593fedf6b3328a39a0c12487bdf
Author: Dan Prince <dan.prince@rackspace.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.

commit 3afa827581e768ad1ee953fba3c23932cf8bdfab
Author: Cory Wright <corywright@gmail.com>
Date:   Fri May 13 14:21:55 2011 +0000

    Add init script and sysconfig file for openvswitch-nova

commit 8d7e6a2be350765aa3a2c6562b53609c4a13b476
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.

commit c7329465cfafdb911e6bbc2ac6b926935364a1e9
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 files changed, 1 insertions(+), 0 deletions(-)

commit cb854b471a6391c8b6ae3ba8d1999e2f35122eec
Merge: e88f96c d87be2f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 06:51:18 2011 -0700

    trunk merge

commit ae03650b7de3f4836f289c84a8c103762a22ab5e
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

commit e88f96c13302435b73b6a09b2bee1ea32ced2e7b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 13 06:12:18 2011 -0700

    fixup based on Lorin's feedback

commit 2531765d597e72d083f2f26f62d9171f0013caeb
Merge: a1c7a4c fa15c06
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 13 21:32:05 2011 +0900

    Merge lp:~morita-kazutaka/nova/snapshot-volume

commit fa15c0601d34e734a1c2db3b52b491bee94e2765
Merge: c2e8e1c d87be2f
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri May 13 21:07:48 2011 +0900

    Merge trunk

commit 78e2d3ea518c98bec51f5434253ef174dbbc6f49
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 12 20:05:41 2011 -0700

    added flag lost in migration

commit 2a37906a6ed23ffadffde9cc1007aa6ce52f5c56
Merge: 4de3be4 d87be2f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu May 12 22:36:53 2011 -0400

    merge trunk

commit cd1186c561b57ce821cd1c20506244ec4cb5b275
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 12 18:44:22 2011 -0700

    pep8

commit 9cd93cf4e2c93b72c9237e78b2bad70a1e17f7e1
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu May 12 20:07:54 2011 -0500

    Adding basic tests for call_zone_method

commit 35eed1923c73af515c0abc9e7cc264bbab9779bf
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

commit b68ebe926f1e40f4757d27463874c949318c12d8
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 22:19:52 2011 +0000

    Make sure imports are in alphabetical order

commit 3967c789c9c459d7cd2b6a55619f48abba7d5a13
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

commit 5c23e4f3806791cc3e327c8de7aa286fee422dbd
Merge: 0e71f1b d87be2f
Author: John Tran <jtran@attinteractive.com>
Date:   Thu May 12 14:29:41 2011 -0700

    merged from trunk

commit 4de3be4a671d09f1eebb81d1d6724800811ec209
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

commit 2746ff97fc12526fc322519e9ea547b6bd3b1912
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.

commit d5f93ab4ad8b2b9385b5053e6dd23105667ada1b
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

commit 1de283030905710b010856597503d17727c175ad
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

commit a3f0a0679c9986e27b55cd869b7f03e73325143a
Author: John Tran <jtran@attinteractive.com>
Date:   Thu May 12 12:51:03 2011 -0700

    incorporated ImageNotFound instead of NotFound

commit b1381e1e7cbe7ce6dba2adca1c433b3b8b4f6d8f
Merge: 9395431 d87be2f
Author: John Tran <jtran@attinteractive.com>
Date:   Thu May 12 12:23:31 2011 -0700

    merged from trunk

commit 59dbba17f69e50599e32f7185d3fed8675be0bbd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu May 12 14:13:25 2011 -0500

    misc related network manager refactor and cleanup

commit 9aac4844f0e3d29fb90c991559574948a67eaeda
Author: John Tran <jtran@attinteractive.com>
Date:   Thu May 12 12:04:39 2011 -0700

    changed NotFound exception to ImageNotFound

commit a5127673019cb2c82c213e6a17d1938406697d9f
Merge: 8c2e322 d87be2f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu May 12 13:54:45 2011 -0500

    Merge from trunk

commit 2ed8694ee7dc83317071a157093c04458863775c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 12 14:52:54 2011 -0400

    Update comment.

commit 2dfb984e086230d15ce443ec5d604fd0e1852a1d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 12 14:45:39 2011 -0400

    Variable renaming.

commit cde56398cfa5c9fb71e4b8087fc9c98bb102ffdf
Merge: 841b348 d87be2f
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:42:10 2011 +0000

    Merge with trunk

commit 841b3485d89c1b1110897b592b120c5059863d89
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:41:22 2011 +0000

    Add test suite for IPv6 address generation

commit 3acdcf47d088a1d71cacfc4e1246ff24a144ffaf
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu May 12 18:40:56 2011 +0000

    Accept and ignore project_id

commit 707e795b6723ae7382e12c11659d4c6e3fa74beb
Author: Dan Prince <dan.prince@rackspace.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.

commit bd43968fdd3bad6012471d87e489301ab84031ba
Merge: f6bdf19 d87be2f
Author: John Tran <jtran@attinteractive.com>
Date:   Thu May 12 11:25:12 2011 -0700

    merged from trunk

commit 4a0254eb8023eec709f2f24f6cc42c2fe9a84238
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 12 12:52:32 2011 -0400

    Remove ResponseExtensions. The new RequestExtension covers both use cases.

commit a34ee38b02b18791afb324f998be59e02ee51086
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu May 12 10:55:04 2011 -0400

    Initial work on request extensions.

commit 90c1c355a1297717dc9246a9c7315f00397c9a35
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 12 17:44:07 2011 +0400

    Added network_info into refresh_security_group_rules

commit 4e16f928831c8a0b2bd24acd1c72b12a14c63303
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 files changed, 2 insertions(+), 1 deletions(-)

commit 0311fb04919237edac7b64be0296275a890f9d60
Merge: 7f559bd d87be2f
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 12 09:18:25 2011 -0400

    merge from trunk

commit 597bae55273ac6c4200a3683d80b6980c52c9704
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'

commit 429a65f85bf34761f4cce66445e18d2f10305f1c
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Wed May 11 17:06:56 2011 -0700

    Fix remote volume code

commit d87be2ff698689b31ffa91606042016f0e5138c4
Merge: be0c5bb f14d46b
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 5da8361563b7447f44d48ad42d179b4f729c25d5
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 21:04:40 2011 +0000

    Implement IPv6 address generation that includes account identifier

commit 08dec112063d75fb9f94ab80c96c5e2215b89359
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

commit b9af08f5adf61e88c47d2c89b77e9f44ac1cd6ba
Merge: 397b7bf 1b87755
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 14:41:39 2011 -0500

    Merge from trunk

commit 397b7bf7dc774792af129e298ace0a59d02e7e12
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 14:41:31 2011 -0500

    Redundant line

commit 54dd1b54ac7c7331849c62134f6a22db3cafb16d
Author: termie <code@term.ie>
Date:   Wed May 11 14:24:01 2011 -0500

    changes per review

commit 52d7e23a62ce4afd655aa91a95f662cb6000d345
Author: termie <code@term.ie>
Date:   Wed May 11 14:24:01 2011 -0500

    docstring cleanup, nova/network dir

commit e8ea93775c2ed6883305693b1b94a390bb70a43d
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

commit 7f559bd246568160cfbd9dfcede8ef4648b7f174
Merge: 7e8aa30 1b87755
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 11 15:16:37 2011 -0400

    merge from trunk and update .mailmap file

commit 8eb4067f132ceee675283b48bcb916b298376c1c
Merge: 6aa97e9 be0c5bb
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 19:16:02 2011 +0000

    Merged trunk

commit 081e63adeb1614ed6fc16c7a42197aa0c97ab1b9
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 files changed, 1 insertions(+), 2 deletions(-)

commit 8171aa91cefafa7a449cf1c011e02d8dc17deeeb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 11:43:58 2011 -0700

    NoValidHost exception test

commit be0c5bbb5e60e2b202f598b3d64b91076040de3a
Merge: 511d065 e20c304
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 66aba29e2f6aa7dc92e05177c5705ece5aba6c5f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 14:32:28 2011 -0400

    oops fixed a docstring

commit 8c2e322af1200db71e7eaa11ed67be0e92ca9f12
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 13:22:55 2011 -0500

    Pep8 stuff

commit 511d065f6111f888b91d21b5e043e86067047931
Merge: 1b87755 73c6cc9
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 7b470b46c0a288f26131958ebb0956509189842b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 11:12:31 2011 -0700

    start of zone_aware_scheduler test

commit 95a112c87e346e5bd394f9194c92017319157189
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 13:10:40 2011 -0500

    Moved everything into notifier/api

commit e20c304ab7d05309687c969267f5ed711f2dc6ba
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

commit 3eee56aeaee6d0ce4f77e269eb9ff21a4dcb7f21
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 14:01:41 2011 -0400

    better function name

commit 2339fe43fd41a02de135ad9af4b5b421f88ebdbf
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

commit 3ed3d715ce0d486803d595fe830532ba37c8aa87
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:34:01 2011 -0400

    more filter alignment

commit 73c6cc9814d0be2ccc3a65fdf74ad768e7b8995c
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

commit 8d7ece78ecbafcba27d15ae9d6e7a0e13b16e7ca
Merge: e0dc7b5 1b87755
Author: Cory Wright <corywright@gmail.com>
Date:   Wed May 11 17:26:00 2011 +0000

    merge trunk

commit acf81da6a246cfd8e7d3e40ccce3e3b34d3387cc
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:21:57 2011 -0400

    align filters on query

commit b9c0b9ef8bb794e446c9c9eb5f8ed8654600bf56
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed May 11 13:00:06 2011 -0400

    better pylint scores on imports

commit 292d5cf667b6b961b84dd8e2a1f7e740b7580c2c
Merge: 0d8075c 63e0397
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:42:51 2011 -0500

    Merge from Dragon

commit 0d8075c4cf6456d1a3bfd13f92927b062daf6f43
Merge: 10f6eae 1b87755
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:41:06 2011 -0500

    Merge from trunk

commit 10f6eaeb35936fd774133e860969f784d917e3a7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed May 11 10:40:54 2011 -0500

    Code cleanup

commit 1085297b8abe109bacc2ce5df789b50a2d44db65
Merge: 411e42e 1b87755
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 11:20:50 2011 -0400

    Merged trunk.

commit 6aa97e91f38be901f89a5b91ff0f50d0d931b7a6
Merge: 05b88c8 1b87755
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 15:13:17 2011 +0000

    Merge from trunk

commit 05b88c89f3570615949faa471800e92984085ea4
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed May 11 15:12:12 2011 +0000

    Abstract out IPv6 address generation to pluggable backends

commit 411e42e0e48eea6c713b4ec0efd94e2bceb9d82a
Merge: d04266d 46220e6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed May 11 11:02:49 2011 -0400

    Merged trunk.

commit f1c497372380080ce95ad4e99787a241be366daf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 11 06:28:07 2011 -0700

    First cut with tests passing

commit f14d46b7c842b90f63e002310402e732ee3c4e9f
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Wed May 11 11:47:38 2011 +0400

    changing Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 89e93bab32951d5834fbcef59e94602f429b469f
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

commit e6a2aeeff2e3d71aec66c63da46e1bb2d88143a8
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

commit 1b8775592f9798e639b8eead196f37a8c3f3ce52
Merge: ec424e3 029168e
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 ec424e3f18204133065aee68d3befd1488d528d0
Merge: 46220e6 74ee748
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 a4b15dc3082552f4e3459981287ceaf8f4c8d7b3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 20:10:10 2011 -0400

    migrate back updated_at correctly

commit 63e0397cbd5a07a0aabb4cc14169d0601154fe0a
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue May 10 23:57:38 2011 +0000

    added in log_notifier for easier debugging

commit 4ea5c60333cae75bd8f1d00c5f1c66a5ecd1045a
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()

commit a61fa4f30aba3367fd75616107b922b4f1fa9f21
Author: Mike Scherbakov <mihgen@gmail.com>
Date:   Wed May 11 03:24:02 2011 +0400

    Bugfix #780784. KeyError when creating custom image.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b949e4f7f0c0a12182961d5b7d13ee2773417738
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

commit 4d1fc5ecd696c8c465e0bd497046e382fef2a388
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

commit 626a57844f88857fe8dbae08b55acb8ade7d97c5
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

commit 88c3776c9a3f42ce4a751e0256379b1698978284
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 16:40:47 2011 -0500

    Better tests

commit 8c7845117b0c3dfee95c1874cbf0947295eee4f6
Merge: aeb58fa 46220e6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 15:42:08 2011 -0500

    Merge from trunk

commit aeb58facb3fb6a4e98651ceed74f29bd915c13c0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 15:42:00 2011 -0500

    Add example

commit bdfb3150081d066dc7b3ec51ffbac172ecbb2d92
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

commit 609166a2c1dd39f458b8c05294546ab071aa9239
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:57:44 2011 -0500

    Whoops

commit fd7219a15c256f46268c07e90af543489dd0abe2
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 15:54:05 2011 -0400

    fix migration bug

commit 25089a1636c3251cdaf25925fae1a28ddf039316
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:53:03 2011 -0500

    Pep8

commit 548a1e6203843014f293fdba1d5caea60b467e5c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:40:28 2011 -0500

    Test

commit 8678ca6d70bf4c27cff4e5380ec96fae78593edf
Merge: 4a962a6 46220e6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue May 10 14:35:16 2011 -0500

    Merge from trunk

commit b326ab753c4cabedd76e79bcb42a177d979e586e
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.

commit 079d20cffa1cb7c1b5057d736b6adcc1c3f74aac
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue May 10 14:49:47 2011 -0400

    migration bug fixes

commit abdb12af164d7caa2f4dc939b935202d9d6603fa
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

commit 029168ed054f7283aa21deb52f04d18f6698d08a
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(+), 0 deletions(-)

commit 2ebc353f18b6e2aa497c0dc78fb86e50bc14ce36
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 9 19:46:15 2011 -0400

    got rid of unnecessary imports

commit 46220e6f407f819b367d97836368aedaafac194d
Merge: c744e49 7267291
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 4ff0d09ad07a0b35ffa4e74e986902629dca01bb
Merge: ac76e8c c744e49
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 9 16:53:16 2011 -0500

    Merge from trunk

commit ac76e8c7dd5a3dc80b2801e7ebac2afe21ea9e27
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon May 9 16:52:52 2011 -0500

    Better message format description

commit 74ee7484d06485992c0a670d21596a390bced5b6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 12:57:56 2011 -0700

    unified underscore/dash issue

commit 1b2c44c4fca2d8d55f323a0b802119be3378fa51
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

commit 4e3fe1b98aeab77478f2c4b1143fc45b3c254748
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 09:10:22 2011 -0700

    pep8

commit 0898c1e895bd1a954e739e45415a842b8d00f8cf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 09:08:56 2011 -0700

    capabilities flattened and tests fixed

commit c744e49391fc028627316600fb7e335522d36b2b
Merge: 97984c1 5bd40b6
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 9a84382d55c82c826eaa686a7b333d98d8592f03
Merge: b91cda1 da23c2f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 08:47:39 2011 -0700

    trunk merge

commit 58c76dda34b1ad89c151820c38e3537441687273
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 9 11:47:33 2011 -0400

    clean up unused functions from virt/images.py

commit 0870d0072fd7c55f5ee06490d3588c9228f617f1
Merge: 542ad2f 97984c1
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Mon May 9 15:35:45 2011 +0000

    Merge with trunk

commit 97984c1bc8e1e3c19e4fefdccb39ddb6604e6659
Merge: da23c2f 5c8aa0f
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 b91cda15a311fdb98c311f5620fa630bd3de0b12
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 9 08:23:25 2011 -0700

    basic test working

commit 677bfc6e341ecd706dbc9d82c28673d894c97f6d
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 20:19:35 2011 +0900

    db: fix db versioning

commit b5434f53c02f21816fef432d8697ff1caef6db47
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon May 9 19:25:02 2011 +0900

    fix mismerge by 1059

commit 36926036fd4d0ba3e51c5688b78c3675d7023a62
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 4b9ccc9ac27679932a4c44305e4d0c9c73a9a02b
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.

commit da23c2fb1364fbc517e6b7f797f00cdac53d7119
Merge: 818b2bd c062f86
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 7267291846fdae42328b4ad6c78a281df95ec097
Merge: bc4985d 818b2bd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun May 8 00:19:28 2011 +0900

    Rebased to trunk rev 1057.

commit 818b2bd61af5f4d782cfd035b452d2dcc9e36a00
Merge: 8ff9872 deab331
Author: Lorin Hochstein <lorin@isi.edu>
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 7e8aa301f5b0b0c78eeadfea62aa278823644232
Merge: 432c6d7 8ff9872
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 21:30:31 2011 -0400

    merge from trunk

commit 8875c417b3ec349b2cf29e6c59ccbed56e8f634e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Fri May 6 20:15:06 2011 -0400

    Set publish_errors default to False.

commit 83162099ac10a8cf25269a41a727b735188b2783
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri May 6 17:37:35 2011 -0400

    convert quota table to key-value

commit 8ff987293745f735020430f2b6e8c17aa4266a3a
Merge: fe52318 10dce4d
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 283b97a814f1a865945f2e52443d89d4a4bb54b7
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 16:48:38 2011 -0400

    Fixed duplicate function

commit 5bd40b692664d63e716e6500ee27b0fc846893f3
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:41:36 2011 -0500

    Review feedback

commit fc8809a1ababa0a6a0cdaeb8702ca32ec0f22096
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:19:55 2011 -0500

    Review feedback

commit badd203af22c29cfd2fd90f87d958f25f8a2fea8
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 16:13:35 2011 -0400

    Fixed method in flavors

commit 6b392f247cc8264ca4b9fbd992ff51916978f110
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 15:06:21 2011 -0500

    Review feedback

commit 23663c6473550ea3922f4ec0b26b6d0fb2ea6013
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 14:48:54 2011 -0500

    Review feedback

commit 88f3bd3c732ce93a23de7d916065b9c2d841a6d2
Merge: 5c0cebb fe52318
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 13:48:19 2011 -0500

    Merged trunk

commit 5c0cebbc6cea0cd321884bf1b14b3719e8962d0b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri May 6 13:47:47 2011 -0500

    Set root password upon XenServer instance creation.

commit deab3313be7aa196ad879dd700b807698046b4b1
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Fri May 6 14:23:51 2011 -0400

    Added Python packages needed for coverage reports to virtualenv packages

 tools/pip-requires |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 644cabecbd71471aa3a57b62f8a9b1acb064734c
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 14:13:27 2011 -0400

    Added interface functions

commit 10dce4d2517a076f21ea64b864bc7c846989b329
Merge: 606061d fe52318
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 14:12:33 2011 -0400

    merge from trunk

commit 606061dc26b80994bd7dec70a222f60e23c41d25
Author: William Wolf <throughnothing@gmail.com>
Date:   Fri May 6 14:11:18 2011 -0400

    added test for show_by_name ImageNotFound exception

commit 3eb211dcd51537b480fd523dcba41f921539448d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 11:04:00 2011 -0700

    tests pass again

commit fe52318801808346255fb0ee71cb0497d531a282
Merge: 8f186e4 330c43d
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 c062f86bc147a9051a9f9b37a4a0ec022986edbd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 09:06:46 2011 -0700

    revised file docs

commit 4461f8c7039a075ff2bd7c471209a3adad111ea6
Author: Donal Lafferty <donal.lafferty@citrix.com>
Date:   Fri May 6 16:54:57 2011 +0100

    New author in town.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 14fb23a95d890f3b3d54e61949088907a085465e
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.

commit 225979cf91c20bd863e8a4bc12cdc4ae9c885a4c
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

commit d04266decce9a2dccacf34ad275e88b0c266b224
Merge: 97cfea1 8f186e4
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri May 6 10:37:20 2011 -0400

    Merged trunk.

commit 0a116593c3c6a73a79e65b3178a6efb84995ae29
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri May 6 07:19:57 2011 -0700

    grabbed from dist-sched branch

commit abbca323238eb4e49cc37d078e3d596b58f3dea8
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

commit e489143566cb2d4a06a887363f06f46e36583f45
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Fri May 6 09:26:40 2011 -0400

    Removed incorrect, unreachable code

commit c822d10fba1afeaccfb6e86bf1acc55ddea57e6d
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 23:25:15 2011 -0700

    spacing fix

commit 1039c95834e6a903dd085724ff6a511b7c42f74c
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 23:23:09 2011 -0700

    pep8 fix

commit abad95fdb1ecfd9b185d41040c339a6170d27285
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu May 5 22:44:08 2011 -0700

    Improved error notification in network create

commit 330c43dea31f34a00fbe4b4e514f0eb0d404aae3
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 6 09:13:46 2011 +0400

    Add two whitespaces to conform PEP8.

commit 8d77a992a26633f740ffe50f78f9d4832c6726c5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu May 5 23:14:46 2011 -0400

    Publish errors via nova.notifier

commit bf1b8df66510d19f0f975304a1c3ac06956eb74d
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Fri May 6 06:50:48 2011 +0400

    Added myself to Authors file.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 3b1e8d198e8c00383d4763c5aa56abd4a86ad48a
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.

commit d15db391978ba6515fa9ab1c5e026c40291a7675
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 5 16:29:31 2011 -0400

    Added interface function to ViewBilder

commit 33e21c0cc67c163fa0133fb3733e3ac3b87d5251
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Thu May 5 15:56:04 2011 -0400

    Added interfaces to server controller

commit b77de110acc845956e498ded6b33d43f410b0b8f
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 5 15:38:45 2011 -0400

    added self to authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit f44b1b42ff7c1c44a65af4c6993ad648de3f5335
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

commit 5c8aa0f6d89d4ed3d7bf372442bf7702662a02b5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu May 5 15:35:34 2011 -0400

    removing rogue TimeoutException

commit fcae7b272324e0638f9288e85faec5fac1543e08
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 10:50:59 2011 -0700

    merge prop fixes

commit a8df5716e9037d53233563962a00c5516214cc9e
Merge: f8986dd 8f186e4
Author: Josh Kearney <josh@jk0.org>
Date:   Thu May 5 10:23:48 2011 -0500

    Merged trunk

commit ac814ea451ae19f6c9fa43f019bc7b952b0fbfb3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 08:13:22 2011 -0700

    print statements removed

commit f1050a09f4380cc4dfa740491401192b3510502f
Merge: d132daa 8f186e4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 07:41:26 2011 -0700

    merge with trunk

commit d132daa298185208ee942f9eab1954f67c82f0e2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 07:35:44 2011 -0700

    flipped service_state in ZoneManager and fixed tests

commit 5fb398e922e54ee31a510bab2b7c68a243f51fe0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 06:01:56 2011 -0700

    pep8

commit 1b3e8fa859dc37438c12a27811757994adc473b2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 05:30:58 2011 -0700

    not =

commit 5d3a6c7883edf45ce7263df17ba163a0ae21c48c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 05:29:31 2011 -0700

    not =

commit b7b634cffc1f71f965769e19372b7a55b22d63ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 04:59:26 2011 -0700

    and or test

commit 9b3651e0530751be04b305cb6a104ad13ff898c8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu May 5 04:57:25 2011 -0700

    and or test

commit 432c6d7f066e8950c59795c04236851c63f54997
Merge: 74e011f 8f186e4
Author: William Wolf <throughnothing@gmail.com>
Date:   Thu May 5 00:17:57 2011 -0400

    merge from trunk

commit b8e04d8b25935f2a2a75c6c9a0f00f6b6a976484
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.

commit f5fcbc6914516e3eecb4068795df313a3593a773
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.

commit 7939d1159d6b27cc877df52e72689f6f6ee07506
Merge: c88bd13 8f186e4
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu May 5 07:04:34 2011 +0400

    Merged with current trunk.

commit 74e011f3d2cabcbc952cbdf3c5d0f3f12445ec07
Author: William Wolf <throughnothing@gmail.com>
Date:   Wed May 4 21:50:54 2011 -0400

    added myself to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e16ea1938660d58a97c784cec1c9beb4acce812a
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Wed May 4 17:29:29 2011 -0500

    Adding a test case to show the xml deserialization failure for imageRef and flavorRef

commit 8f186e405087440b6c522b563392c328bb0cbb45
Merge: 309063b 1fe358c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed May 4 22:06:44 2011 +0000

    Fixes for nova-manage vpn list

commit 49ef6c2d57884039c99dcd8f6c4bd703a2d8eb6d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 4 14:48:23 2011 -0700

    json parser

commit 309063bf484810f5f71e6baa5c8864b0e3be6b82
Merge: daea005 fe5e417
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 fe5e4174fce1adf88d80ec7c8dbdfd05f58aa4a7
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.

commit f8986dd8679675a7ba23f4c83562b003933b9a7e
Merge: c7e60f5 daea005
Author: Josh Kearney <josh@jk0.org>
Date:   Wed May 4 14:51:12 2011 -0500

    Merged trunk

commit 68b171ab449e86be0def08fbf46763b9f661897a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed May 4 06:16:33 2011 -0700

    flavor test

commit f025a7e51594ef2d184d3ccd78d9623312a531ab
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue May 3 17:08:04 2011 -0700

    Fix indentation.

commit a61cb421f8104f86fb93233013df259656448fba
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue May 3 15:02:55 2011 -0700

    tests and better driver loading

commit c88bd13242c1254676ff43de0274e132679278ee
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Tue May 3 22:34:00 2011 +0400

    Add missed hyphen.

commit daea005c37d4c2d23b2b03b837e23c38fb13346f
Merge: 310442a 2026f3c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 18:18:51 2011 +0000

    Adding OSAPI v1.1 limits resource

commit 310442a7847ea191b3df07e9ef3a4af42b1ead04
Merge: 54905be 9e116f4
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 32ff47aaa8b5f4db8378a6cb15a788a8542db9f0
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue May 3 21:16:58 2011 +0400

    reduce policy for countyname

commit 5b1a413277eb5d5b288734b3f8ee69860aecf20d
Author: Lvov Maxim <usrleon@gmail.com>
Date:   Tue May 3 21:16:03 2011 +0400

    looking for default flagfile

commit 9e116f43bc48e6f77b1f179288f1ad6af2ebc67d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:32:40 2011 -0400

    adding debug log message

commit d8b910be50b662014bc7bfef06ee990a7b0210a3
Merge: fde94dc 54905be
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:29:54 2011 -0400

    merging trunk

commit 2026f3cebf996f787043ada8bab6f09054a4e323
Merge: d1c41e8 54905be
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:29:11 2011 -0400

    merging trunk

commit d1c41e8741c081ca2d7e8a9faea04270721eea6c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue May 3 12:25:19 2011 -0400

    removing class imports

commit c7e60f5fa18f4f327397296eb04c37e45d6dd6d4
Merge: 6b980cb 54905be
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 3 10:18:59 2011 -0500

    Merged trunk

commit 6b980cb7429d6a3851bc1124cab0f5487003b74a
Merge: a358180 5a98688
Author: Josh Kearney <josh@jk0.org>
Date:   Tue May 3 10:18:27 2011 -0500

    Merged trunk

commit 4c1199ad3e086e0e7e8e2da2618e8ddd4d4111b5
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.

commit 54905bee86b0e54acd5a25b490413f1678df8bee
Merge: d330c4c 0130f77
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 2d24e9653125c9c3c7a2a1406e8e9bee9081f582
Merge: 20bf3d4 d330c4c
Author: William Wolf <throughnothing@gmail.com>
Date:   Mon May 2 18:07:30 2011 -0400

    merge updates from trunk

commit d330c4c4e0fff02e8e73b75cfa0a296d96ab3cf7
Merge: 9d647f9 15fac53
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 9d647f9a921497bdcbe5ec57333bfbcdb7f643c1
Merge: df03a13 2a10702
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 f6bdf1978e286c4a2ab41070217fcbccdc87900a
Merge: 342a48f df03a13
Author: John Tran <jtran@attinteractive.com>
Date:   Mon May 2 14:25:38 2011 -0700

    merged from trunk

commit 342a48f6404cfb8847d40ebd0ce51cbdf3b57a25
Author: John Tran <jtran@attinteractive.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

commit 20bf3d4ed82c009119b951e15b36ac0325783d61
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 files changed, 0 insertions(+), 3 deletions(-)

commit d11a2c97579cd77be547774782ab1401971c0a20
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 15fac533488ad845458a90909b633bf199a08afb
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.

commit fde94dcd00ff1f7df017fe096d0c6f5bd0d1a419
Merge: 3914fb3 df03a13
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 6754a36712fe88d54193e4d19bb34dd51d1caa68
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"

commit 2b27c334b0c70c182fb2ba409e0d8d2a5e838d73
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon May 2 12:49:10 2011 -0700

    initial pass

commit df03a1306330eb28f98b1f8ccc51caa9625bece9
Merge: 7b0a560 d341601
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 2 19:26:06 2011 +0000

    Implement get_host_ip_addr in the libvirt compute driver.

commit 3914fb399e69b900557ab21611f5418146ee9809
Merge: e69fbe8 6cee341
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon May 2 15:23:11 2011 -0400

    merging trunk; resolving conflicts

commit 7b0a560079a2b5faad636bc87e4fd75dbb12decb
Merge: 6cee341 59de820
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 2a10702431947f98e6122a5b47fccf197764ce3f
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon May 2 13:19:58 2011 -0600

    Fixed 2 lines to allow pep8 check to pass

commit 6cee341f48bdfeb82e04e805d81299649aedce7c
Merge: c1e5f3e f77f0c7
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 c1e5f3ee10b220667f2838fc1a6a21eccbd4a7e5
Merge: 9bf3a0a e0c0393
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 9bf3a0ad4875cd176c1cf3094ec2f3efd0781340
Merge: 4b799e1 8595a76
Author: John Tran <jtran@attinteractive.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 4b799e15ba259c513938444ac6bb569f2f037248
Merge: 85880e6 9e065c9
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 17:59:48 2011 +0000

    Fixed: Check for use of IPv6 missing

commit 85880e677b925805a6b9c36332ca97aad0fcbdca
Merge: 9b646a8 4a9cee1
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 17:45:48 2011 +0000

    removed unused method and fixed imports

commit 9b646a8a3660b7a7dae93c355e18cc29ed1a34e3
Merge: 5a98688 9f8d823
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 d34160158233a00086fec465e1568670c9cc2315
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 2 10:17:51 2011 -0400

    Use my_ip for libvirt version of get_host_ip_addr.

commit fcb170e94e17835f5106474ab364d57fca74d740
Merge: b893dec 5a98688
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon May 2 10:09:17 2011 -0400

    Merge w/ trunk.

commit 4a9cee1e8f5ad8792f55964f52f50d1204ba22f0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 00:55:54 2011 -0700

    fix typo in import

commit 0f5580d882f23313fce892653a626b4b87ccecd4
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon May 2 00:45:09 2011 -0700

    removed unused method and fixed imports

commit 9e065c9df393aecaa25befefada3a9a139a8ee38
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 20:43:06 2011 -0700

    small changes in libvirt tests

commit db7e9de453bc2a8d1ef0f75ebc1f9ed4ff95a0ca
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 12:10:54 2011 -0700

    place ipv6_rules creation under if ip_v6 section

commit b37963fc79f802b025ba089b4a89bf3364efd9b8
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun May 1 01:01:01 2011 -0700

    Added checking ip_v6 flag and test for it

commit 5b8409a7fc5680307f8da1e886ef863d801f8005
Merge: 68399c5 5a98688
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Apr 30 07:16:27 2011 -0400

    merging trunk

commit 68399c55287194fadcf221d08a2e1d74324e0979
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Sat Apr 30 07:14:20 2011 -0400

    adding view file

commit 5a98688961016687cef222c95a09663442684cad
Merge: a83c286 bf23d75
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 a83c2866af02c36f0638c793bfd1fc193a68138d
Merge: 8ef5949 2ca10d9
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 8ef594973c6fe40054692cf1bb0c69cbf0fc0f84
Merge: 395811e c831879
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 395811ecb97690363bb2d65423fc3ce9b0292c3a
Merge: fc2ab37 4d7a60c
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 9f8d8233669efb72062a4159e57559fee8b16021
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Apr 29 14:39:13 2011 -0500

    Changing links in sidebar to previous release

commit bc4985defe12e7775d4b31f16676dd399eef56f3
Merge: 61449b0 fc2ab37
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 29 22:25:28 2011 +0900

    Rebased to trunk rev 1035.

commit fc2ab37fcdca104c20aec47691e6041864db9ac8
Merge: 4f82aed 36785f2
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 9618508486c6249a128abce9bcdb4552bbcb6426
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.

commit 36785f2977f4f73d5b7fdbcb2e28e289b14aaec3
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

commit 4d7a60c3bf82310b6cb429170865c17b2c62c18d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 12:49:48 2011 -0700

    pep8

commit e39f20073b7c84df961d09fb3d3c69d89526e27d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 12:49:07 2011 -0700

    fixed docstring per jsb

commit 6f765e16be7d8f36afd3da838c9d8ae61b816d48
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 28 10:26:43 2011 -0700

    added version list command to nova-manage

commit 4f82aeda01051abab26acb93138f198cc83ed89f
Merge: 71a9d16 963c078
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 3da3e6d60687fb7a604946ec18e5fafaee190ed1
Author: Yuriy Taraday <yorik.sar@gmail.com>
Date:   Thu Apr 28 14:41:56 2011 +0400

    Sanitize get_console_output in libvirt_conn

commit d13b4dea3220f1f4d2138fad15dae1fc196d72f7
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

commit 71a9d16b2404bf41930ee4163f355caaa2561d71
Merge: e01f716 1ac534f
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 2ca10d9e52140c718ea20680f3fd4ed88889fa28
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Apr 27 14:23:21 2011 -0700

    Correcting exception case

commit bc5b121a8b982240f0873a3d98da71e66f1ea2f8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Apr 27 14:03:05 2011 -0700

    further cleanup of nova/exceptions.py

commit d23c357dba895e9c53672e8f1b47902a84b06187
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 27 15:20:46 2011 -0500

    added eagerloading mac adddresses for instance

commit 963c078f6e86bbcb771e02e7c732cb7fec9fd605
Merge: e663f6d e01f716
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 27 00:51:51 2011 -0700

    merge with trunk and resolve conflicts

commit f77f0c731707dc374140c377225b32b8b4dc011b
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 27 00:53:07 2011 -0400

    Added myself to authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 59de820e3d8558caf47ea93837a3383c6827ca24
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Wed Apr 27 00:30:33 2011 -0400

    pep8 fixes

commit e01f7167d1e2bde5725e3684db499679e556daec
Merge: 3883e07 3fdb6fb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 23:01:29 2011 +0000

    Refactoring usage of nova.exception.NotFound

commit bf23d75584be64f7050d54abc0d406e35f64fca6
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 26 18:55:13 2011 -0400

    Let nova-mange limit project list by user.

commit 3fdb6fb62a8cf06c724a16aeccd7fa51d95e66de
Merge: 6a34e39 3883e07
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 15:48:28 2011 -0700

    merging trunk

commit 1ac534fe5f28b95bfd28a832290b61929c26cf4c
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 files changed, 11 insertions(+), 7 deletions(-)

commit d04932642bf5c0f4c3340b5d1231925cce1aa3a9
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 files changed, 1 insertions(+), 0 deletions(-)

commit 06c9f2aa64715a94f1935886f6538e7fbc0a0e90
Author: Alex Meade <alex.meade@rackspace.com>
Date:   Tue Apr 26 11:25:02 2011 -0400

    Fixed formatting to align with PEP 8

commit aeec958f9cf315f664e5f93e75b59c107360b6a0
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

commit 3883e0715a4e32a342ed9c74a434caa6a8537e4a
Merge: ceb1265 c62cbca
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 26 04:26:14 2011 +0000

    Refactoring the usage of nova.exception.Duplicate

commit 61449b0541e4805450318faacca55810b301cbc6
Merge: 32d2156 ceb1265
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 26 03:58:34 2011 +0900

    Rebased to trunk rev 1030.

commit 8595a769564793e44c34281ac480d816406e12f6
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Apr 25 12:55:59 2011 -0400

    removed extra newline

commit 939543194bb168f8fb48fd7db2b522049a0724f2
Merge: 89e6acb ceb1265
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Apr 25 12:36:00 2011 -0400

    merged from trunk

commit 0130f777d63ed59bc6f46ba11181d02ff9af318b
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)

commit ceb1265226113b8e574ac5285c50bc334d8472b4
Merge: 4b5beff a8ea1e7
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 e0dc7b5ecd1e4256e93922d4c7ded6ed0530ad5a
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 22 16:35:26 2011 -0400

    removed unused imports and renamed template variables

commit 6a34e39fac1aad228688030893d3d91f4f42eda8
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:49:37 2011 -0400

    pep8

commit 8f860474fd14a067147da68e8ce80673727fb98d
Merge: 4eeaa0d 4b5beff
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:44:24 2011 -0400

    merging trunk

commit 97cfea154bf78c0d6f04fed969f360dc36d2221d
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.

commit c62cbcacb3ead13edf9ef2c03bc9989d43a845f7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 15:14:36 2011 -0400

    fixing bad merge

commit e11d4920e5759e7e874d35a78fb0924d1cefbe4d
Merge: 5abb96a 4b5beff
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 22 14:57:37 2011 -0400

    Merged trunk and fixed simple exception conflict.

commit 277e7ea42b6938de7a43839a46e439a7bbdd4f71
Merge: 042d090 4b5beff
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 14:35:24 2011 -0400

    merging trunk

commit 4b5beff7660b32e44377fe9b0f438981c03c1802
Merge: e6a12c8 adae674
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 22 18:21:32 2011 +0000

    Refactoring nova.exception.Invalid usage

commit adae67429f73685a8e639095fa827fa5099bc948
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 files changed, 2 insertions(+), 0 deletions(-)

commit e6a12c89ac2c55fcf59af43fee07728908a5e061
Merge: 6cb6c95 7106e82
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 5abb96ac8dadbc2c56efed50a6a270a428ffc97e
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.

commit 64d2f3135e81c5f54e155e09dff24f1c94ce0e42
Merge: 292f07c 6cb6c95
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Apr 22 10:39:35 2011 -0500

    Merge from trunk

commit 7106e823d80e29467e9b5c0af00a8d72b0b9a4e7
Merge: 09f4b4b 6cb6c95
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 32d21566be74e6bae25cae7e060c4521d77f4d06
Merge: e01b8a0 6cb6c95
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 23:58:58 2011 +0900

    Rebased to trunk rev 1027.

commit 6cb6c9540a7f9334bd394aa76ecde5ef49861cdd
Merge: 52e0b3e e511c7d
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 0a1c8fcf3c266c16f512c6d6232b5badcb031efa
Merge: 5614948 52e0b3e
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 22 09:34:15 2011 -0400

    merge trunk

commit e01b8a07757a77c0896512ad59c08743652a23ea
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.

commit e511c7decf34df02366d1a3e1713bc7a9cac3769
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:22:23 2011 -0700

    pep8

commit 99be2f8d7e6852c8a83573cc8df1cb83bd356d5d
Merge: d986cb1 52e0b3e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:14:11 2011 -0700

    merge trunk, resolved conflict

commit d986cb11d7b6f5fc93af5fd637fa1bab28ce78b6
Merge: 4bd97e0 5399b03
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 22 00:11:54 2011 -0700

    merge trunk

commit 52e0b3e48fc0b0a6c00ba61879bbdec53f1956cd
Merge: 784f2a4 1190502
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 784f2a4b7b6cf97384200e9744353117211f76e4
Merge: 56749a4 c69386c
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 c831879db3c6913f90ed92092bbc00280a5ad40d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 23:45:02 2011 -0700

    Fixes per review

commit 56749a41aecf7f53597307850b1118c54a25f583
Merge: 1b7c8d4 6f9ae10
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 1b7c8d4082a60c064358e918378b7ecd9a747d0b
Merge: 13087ae 96d080e
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 1cdb95fab0e49f49286f66448acbf9509a129172
Merge: 0a4aedd 13087ae
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 21 22:15:16 2011 -0400

    merging trunk

commit 6f9ae1030075c858c99847e8c3e66713c17ec27c
Merge: 241d87b 13087ae
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Apr 22 09:57:19 2011 +0900

    Merge trunk.

commit 13087ae2cd2077504d610426678b8360e861b2f5
Merge: d059ccc c355e16
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 c355e1675077ee2417f572667d24d579451e8d3c
Merge: 257120f d059ccc
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Apr 22 03:25:07 2011 +0400

    merge with trunk

commit 77326c6d56865e582d9113e78948151f8116cc26
Merge: 39bea5d d059ccc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 18:11:12 2011 -0500

    merge trunk

commit 96d080eaa950f49f74c171620d054501e69c5bcb
Merge: 765dc0e d059ccc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 16:01:38 2011 -0700

    merged trunk

commit d059ccceb0a19c2665331701795c9c1c3b0d5ef8
Merge: dfa171a 6547c3f
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 dfa171a6d62b7cf5e00734ed7129110869231947
Merge: 7c85962 6f972f3
Author: Dan Prince <dan.prince@rackspace.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 39bea5d89388f593b110ad582836e032c6f4dac5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 17:36:42 2011 -0500

    create network now takes bridge for flat networks

commit 7c85962d289c1ca9edc059a741a755c93a786cec
Merge: 08ba7b2 5e90462
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Apr 21 22:13:47 2011 +0000

    Adapt DescribeInstances to EC2 API spec.

commit 08ba7b2686d95a1c9f6cb787bdd51b3d635a9264
Merge: 67cccb2 787b8d0
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 e69fbe84ce244b69ed9e80d9eca37ab3986578b4
Merge: b4988ce 67cccb2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Apr 21 16:18:49 2011 -0400

    Merged trunk and fixed api servers conflict.

commit 86369e559123ea3aebdef23fa5c1dfb246465ec7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 13:17:32 2011 -0700

    pep8

commit b4988ce4c98cb4294a34cab3d682c95ec98a06fd
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Apr 21 16:17:16 2011 -0400

    Fixes and reworkings based on review.

commit 06e5293b1446836dae28529fc0cf91cd0c4b8b30
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 13:02:33 2011 -0700

    pep8

commit 4eeaa0d7c0d6a463d46f6738351c24d3b86792d9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 21 15:50:04 2011 -0400

    Addressing exception.NotFound across the project

commit 67cccb22d91c0fd5674db27c07b8d4f0b560d28f
Merge: 8b98821 22dc002
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 19:46:35 2011 +0000

    fix logging in reboot OpenStack API

commit 5ceb7dd30a7d16a12ea4ca6b8cc72321901a9f41
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

commit 043958f4360887102b55d9cfff2021e85e1a7903
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)

commit f06166a19ce53f3c0f65897032632f4d7bbdc422
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:53:20 2011 -0500

    forgot import

commit 561494861afbe4c2d78067f4e2ba0cad9970a4cf
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 21 14:53:03 2011 -0400

    change action= to actions=

commit 2608347db3e2f3688e10c12b22e1b589202ed006
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:46:37 2011 -0500

    typo

commit 72d270c6b1f7e58583a4cee1e352cf0996ef1d4b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:42:23 2011 -0500

    forgot to save

commit 4bf8c4b7712bbbdb15a84c154508a10a966f4286
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 13:38:23 2011 -0500

    moved get_network_topic to network.api

commit c69386c280a6ec2071befc1d29920fce34352ce7
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 22:23:40 2011 +0400

    style cleaning

commit 8b98821a6e0f08fc5eca771e4d226aa184a9354e
Merge: 740f62c 8922d1f
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 17801cb21904e21ba12df26160109d44bcb1b2bc
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit df5922e392faeb24a41bd8e30dbf5df6b30e1c52
Merge: d0adc5d 740f62c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 21 10:29:11 2011 -0700

    rebase trunk

commit b60ad30bfb8f088752dc2ce98221f9d21ad572f8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 11:54:20 2011 -0500

    altered imports

commit 493b71ec9850fa4bd4b173fbd6fb78ed701e3cb7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Apr 21 11:48:47 2011 -0500

    commit to push for testing

commit a765fecfffaa7de411b9853cce7b40a8359bf085
Merge: 9d77861 740f62c
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 01:27:24 2011 +0900

    Rebased to trunk rev 1015.

commit 9d778610bd306092ee113bbbcafa07333fb9de3f
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 22 01:26:59 2011 +0900

    Utility method reworked, etc.

commit 740f62c79fab61d0decafa2c09ad27b7aeee347c
Merge: 35ba981 15cdc8f
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 35ba98118defe40bc68e47937d4ac76d502c1ddb
Merge: 1c55d73 99d00f5
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 1c55d739fe962161f9cb100062edc4163853da74
Merge: 42584a6 6ab0085
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 765dc0e3be7407887541215d3663f8b11dac7eeb
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

commit aa008e3f0de6f3fea98964e654e84e6d5e79f0f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 21 07:35:30 2011 -0700

    use simpler interfaces

commit 42584a6f0059d493da4deb67263152f22faefa2f
Merge: 0b8b842 19d9fd4
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 0b8b8423744197927ca18f49650ed0d37d2491a5
Merge: 939e3b9 3666182
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 774bdeb96727e106cc866522e09cea0d32b98d74
Merge: 19a2e34 939e3b9
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 21 09:37:32 2011 -0400

    merge trunk

commit 5e90462931c86d7baa5fb59d57c4d936dcc6db3d
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Thu Apr 21 15:23:36 2011 +0200

    Add privateIpAddress and ipAddress to EC2 API DescribeInstances response.

commit 60263c9739ee5ec77beedea5a3d3a7507e825dd6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 15:49:47 2011 +0400

    style fixing

commit a8ea1e74fe3357cd48a9c9ef5a1fe3b5d57b2042
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

commit c49b620e3a6fd552454f45a25579bea80f646c49
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.

commit b08f3fdfa32a192383ff921ed25645a60f5c40ab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 20 21:06:56 2011 -0700

    put up and down in the right dir

commit 939e3b960049bec184338a52eccb72ae23ba18b7
Merge: c8ab64e 01aa1db
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 d6c3fd6f8dd772af4f34265d3209ef7cb371ccc8
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 05:22:09 2011 +0400

    pep8 cleaning

commit 8922d1f98bab84a697bd80216c48213e1a8d4d3f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 04:31:17 2011 +0400

    style fix

commit 257120fc9006ceda4b46c2483854cf1c6013d24c
Merge: 90860fb c8ab64e
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Apr 21 04:20:19 2011 +0400

    revert changes that doesn't affect the bug

commit 01aa1dbc560c668f445655bbd97a47842667125e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 20 16:21:37 2011 -0700

    in doesn't work properly on instance_ref

commit c8ab64e6d66d7866e2c7a24695f1840fba4f92ae
Merge: 9a8d76d a33d940
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 21:17:25 2011 +0000

    Another small round of pylint clean-up.

commit 9a8d76d953b1b406d4724141d82ebe855ba50ce4
Merge: a358180 de2899c
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 19a2e3456436240c1bfd7cfbf4b9c77234ccdfdd
Merge: 04ca03c a358180
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 17:01:35 2011 -0400

    merge trunk

commit 1fe358c3f4d3a92adf5c1e7c74f31d119d29f68e
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

commit de2899c97cec0d8b98186853179340720f686f93
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 files changed, 1 insertions(+), 1 deletions(-)

commit 15cdc8f848b94aa5af535f5cd7bf4c28505cd05c
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:17 2011 -0700

    more changes per review

commit c6ac5869672b272d233f9e4af927eeb0dbda32f7
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:17 2011 -0700

    fixes per review

commit 60b5bf998960650f5a55d97e57ebfce59cb2a431
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:26:15 2011 -0700

    docstring cleanup, nova/image dir

commit a35818061c5d98e9c6b27c301dce51fa73273583
Merge: bf35c57 7abaaff
Author: termie <code@term.ie>
Date:   Wed Apr 20 19:11:14 2011 +0000

    Docstring cleanup and formatting. Minor style fixes as well.

commit 6ab00856cc84a7e184f469dd98a733ef17e5d3b3
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:08:24 2011 -0700

    cleanups per code review

commit 6516f50d5002505f52aca9622d6ebe0c7f1aec0f
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:08:22 2011 -0700

    docstring cleanup, nova dir

commit 19d9fd429515bee6223f1e92cecd39f1b8504068
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:06:10 2011 -0700

    fixed indentation

commit 3ea4401724b5d4efc4a08080515310933a2818a4
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:06:10 2011 -0700

    docstring cleanup, console

commit 99d00f52bea7e9419b3c91641040a29225e20a2e
Author: termie <code@term.ie>
Date:   Wed Apr 20 12:00:21 2011 -0700

    docstring cleanup, nova/db dir

commit bf35c578446b129f27e39806d81c3f2c44cc59c6
Merge: 5399b03 0eb09d8
Author: termie <code@term.ie>
Date:   Wed Apr 20 18:56:20 2011 +0000

    attempts to make the docstring rules clearer

commit 366618200cf9dc7bad43a212be4f05f0f8ab262d
Author: termie <code@term.ie>
Date:   Wed Apr 20 11:52:19 2011 -0700

    fix typo

commit fd763a89f177ae939f2ec2f0f34394f7c7a4a70f
Author: termie <code@term.ie>
Date:   Wed Apr 20 11:52:17 2011 -0700

    docstring cleanup compute manager

commit 04ca03c7a6d54d45757518f0f7be7463af3758e9
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 14:24:29 2011 -0400

    bugfix signature

commit 358abb329f0ed2e40a6092fec6faa69d12b5a22d
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 20 14:11:25 2011 -0400

    refactor the way flows are deleted/reset

commit 90860fbfa326fa172bfa2d1b2aa0548a42dbb788
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 22:01:14 2011 +0400

    remove ambiguity in test

commit a33d9408ef23d034865e0dcfec64995542bbd1ce
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 12:56:44 2011 -0500

    Pylinted nova-compute.

commit 7c1d0ca5ebe5344df88942a8dad9a6ad76d68ed2
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 20 12:50:23 2011 -0500

    Pylinted nova-manage

commit 2c1ecc207970f8380bf7453ebd368c56e11e58f6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:50:03 2011 +0400

    replaced regex to webob.Request.content_type

commit e663f6def805a9a3f7e379cabf21018a437b38a2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:34:55 2011 +0400

    fix after review: style, improving tests, replacing underscore

commit 3e42c0290daf4302f528dffa3ea85060741f236f
Merge: d602e21 5399b03
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 21:08:18 2011 +0400

    merge with trunk

commit e3255628a919a73655398264d7bc06a06959eb51
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Apr 20 20:37:51 2011 +0400

    fix Request.get_content_type

commit fc6a7c42346836a6f16533de927d1045c9df2445
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:16:35 2011 -0400

    Reverted bad merge.

commit 5149f5823eac4b4250554abde84b5d17b539be7c
Merge: 147e5e5 5399b03
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 21 00:11:59 2011 +0900

    Rebased to trunk rev 1005.

commit 36f5823006e295288839a4bc6afd953beb80161a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:11:45 2011 -0400

    Removed no longer relevant comment.

commit 837bb1c734daf0ae39e82177bfcbd85ebcafd0da
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:09:14 2011 -0400

    Removed TODO we don't need.

commit b82fc68552f5b47dc6ba26b5e0f1bb6d72745208
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 11:06:03 2011 -0400

    Removed _ and replaced with real variable name.

commit 8fce4bc03b0fb33f37b91853115bace4112e32a8
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 18:35:07 2011 +0400

    instance type get approach changed. tests fixed

commit ebb1969e8aaf293e2c0d93c3745023ba27e1bc16
Merge: 3ef2403 5399b03
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 20 10:32:29 2011 -0400

    Merged trunk.

commit d9bcf06219748a1721ea766d85c453e381cd5223
Merge: 1445155 5399b03
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 18:20:27 2011 +0400

    trunk merged

commit 64b81d4c7e2019d4c227bc71d9f1e3e6eeefb259
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Apr 20 17:44:25 2011 +0400

    fix: mark floating ip as auto assigned

commit 787b8d0ccf8a5b0e444d3fe2cf1e80beb7af2aa5
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Wed Apr 20 14:12:47 2011 +0200

    Add to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e71e5ec1d33efcd985e13491be08c39e8dca2bc3
Author: Jimmy Bergman <jimmy@sigint.se>
Date:   Wed Apr 20 14:06:23 2011 +0200

    Change response format of CreateVolume to match EC2

commit 4bd97e0b747192f9ddd73136acb2139e88afd63a
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.

commit 9e8d150e77a5193189d82c109c231b2707e96e3c
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 19 22:13:40 2011 +0000

    only apply ipv6 if the data exists in xenstore

commit 6f972f363fa26066f1294b05bdd7550a7c1df0e5
Author: Dan Prince <dan.prince@rackspace.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.

commit e0c03935ff626ff5cdaa83e062a6cdab6e3e17a6
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

commit 4df6a8ef16248cd7247120eda3509ffb6fb71ca6
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 19 20:10:57 2011 +0000

    strip output, str() link local

commit 41d67c410994d4f84edf179f06ac110bb9501f8c
Merge: 5399b03 0a4aedd
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 5399b03a3b88c17b2fa8e43e0385579606745f9f
Merge: aa0f1e7 ef8cbbf
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 19:31:17 2011 +0000

    Round 1 of pylint cleanup.

commit ef8cbbfcee2120ff9ece883ad1786dfe8d22039e
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 13:29:16 2011 -0500

    Review feedback.

commit aa0f1e7869762591bd46c340d7ce593c127ddb56
Merge: f862f1a cc31b46
Author: Dan Prince <dan.prince@rackspace.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 995965a47972dfbab053f1404729513e221fad6c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 10:31:35 2011 -0700

    fix doc typo

commit 22dc002742008541408fe0a31dbd086d6552ff63
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Apr 19 21:25:53 2011 +0400

    fix logging in reboot OpenStack API

commit 98788f39147d9800e0a5e77f0972cdcb8c2552ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 10:20:56 2011 -0700

    make geninter.sh use the right tmpl file

commit 042d0904c14bb3b7ce0c5bddb4f0421f7f53c3e2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 13:18:15 2011 -0400

    pep8 fix

commit 4baafd68d676bd39f867f05e7be147e937e43bbb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 13:17:21 2011 -0400

    refactoring usage of exception.Duplicate errors

commit 5a10776c723fc03b7feceb126cb7ce8bcbaedcfc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:38:01 2011 -0700

    rename all versions of image_ec2_id

commit 11905025fc64c9497b7ad5cd4b1d3c8c51bf3fc9
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.

commit 750da630c99f14e0fe0cd39bc5af99ad09cefd5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:32:33 2011 -0700

    actually use the ec2_id

commit a5fce9ec65213f51c653e4c4cb4fd1ed080db9e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:31:18 2011 -0700

    remove typo

commit 2b67300412a3743aeed5076e368455c1dd3567a4
Merge: f862f1a 0a4aedd
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 d70f79763981cc5feeff46a3506357ed6d3a351c
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

commit 9dd800ea130adfbeced7b401861fb6c99b3803e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:16:45 2011 -0700

    add include file for doc interfaces

commit ea99c940afbbd99f8b4d340b090b9484751140c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 19 09:16:25 2011 -0700

    add instructions for setting up interfaces

commit 6547c3f68bd732a66229bbff808ee8d21f06388c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:33:51 2011 -0400

    Merged trunk and fixed small comment.

commit 1e878bd34ab06cc9f12035f66105e73fdbf97347
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:29:26 2011 -0400

    Fixed info messages.

commit 6bb6cad86a71e4800d9d85d12cd44b63f2c66f51
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:16:46 2011 -0400

    Tweak to destroy loop logic.

commit bf5f027761b0e5916789240e49dcb3382433ecf5
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 19 11:09:07 2011 -0400

    Pretty critical spelling error.

commit 295fd4935afcb5569b9613f0fefbd1d96506db2b
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.

commit 0a4aedd5a5fb61de5dc68628f10ef76cee7d3caa
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 10:55:47 2011 -0400

    one last i18n string

commit 317704e1b77625f3da79e4a9bc69001b21b8b52b
Merge: be3564d f862f1a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 19 09:44:10 2011 -0500

    Merged trunk.

commit 138194b8b8a6da7bed2232576b1ed9a683ad31c2
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:50:53 2011 -0400

    multi-line string spacing

commit f2bb5cbafdd4a4537fe135e3d4ef43e5dc4c3ccc
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:48:44 2011 -0400

    removing rogue print

commit 2b9bbc7af2e3ab8c2abbfd77f163f10a3e064adb
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 19 09:48:07 2011 -0400

    moving dynamic i18n to static

commit 38f93a99f0861303a10e4b5b51ed4722fdd60cbf
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 19 16:57:17 2011 +0400

    refractoring

commit a1c7a4c61adafaa3c98f327e3b469c0bf577eb2c
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:02:00 2011 +0900

    Add support for cloning a Sheepdog volume.

commit 488c25bdccd97c9f387242b96dbe24179ae746a2
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 21:02:00 2011 +0900

    Add support for cloning a Sheepdog volume.

commit 03c9955906f0e5e6fa7bdcd1edc146e2b42fe6cb
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.

commit 0888b9bf4e07251e1f06d43f45cc29e768232077
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.

commit c2e8e1cc1ba63dfeb1823e69abbafb5095718bb3
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:50:10 2011 +0900

    Add support for creating a Sheepdog snapshot.

commit 162732c1635e6e91f1a54fdf0a5b9846b7de7b74
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Tue Apr 19 20:50:10 2011 +0900

    Add support for creating a Sheepdog snapshot.

commit add487707b9bf015903640d70888742fe333cbae
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.

commit 14c10cba86bacd577e3af72c51c83f5b649b1252
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.

commit 6b73cd87025495b160a93abdb000120e72dc9c2c
Merge: 63e8f18 f862f1a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 19 13:54:47 2011 +0400

    trunk merged

commit b893dec3f1cbf78b71939a344a691068059dd10b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Apr 18 22:02:54 2011 -0400

    Implement get_host_ip_addr in the libvirt compute driver.

commit f862f1a2ca2db640e7bb3bde224d14ef845f1893
Merge: 767579f 22a6ca8
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 767579f5045ec5f9a673a18a0caea5f98191b5e3
Merge: 7bd89a2 96559ee
Author: Jason Koelker <jason@koelker.net>
Date:   Tue Apr 19 00:31:41 2011 +0000

    pep8 fixes

commit 7bd89a22fbad0e251808b1289d863a2eecb84c41
Merge: 9edd2a4 c3df26c
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 9edd2a448d6d786e3c885943327c35d9e3c1f576
Merge: 9c25742 a31522c
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 23:40:03 2011 +0000

    use 'is not None' instead of '!= None'

commit 9c25742132aa278e4b120246b979246fe31360c7
Merge: 9f8b519 9a945da
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 4a962a6365f01caec6de2a5e81d9f16f09dea13b
Merge: f3cacb2 9f8b519
Author: matt.dietz@rackspace.com <>
Date:   Mon Apr 18 22:21:32 2011 +0000

    Merge from trunk

commit 9f8b519305a002dcadfe03fdc7e150e78d0c3038
Merge: 5981b92 8d2f984
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 be3564d6ce9c887e99cf41ebae3cb724481cbe82
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Apr 18 17:00:39 2011 -0500

    First round of pylint cleanup.

commit 8d2f9847a001bfb0222ba4ddedd2255b7ec05113
Merge: 52be788 5981b92
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Apr 18 17:42:24 2011 -0400

    merge lp:nova and resolve conflicts

commit 5981b92dd190b02d6c15ec3925ffef44f3d1200f
Merge: cd8566a 5b9bc74
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 21:21:51 2011 +0000

    Change '== None' to 'is None'

commit c3df26cce612cb696851656d23ac1f99e61cd3be
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:55:48 2011 -0500

    remove zope.interface requires

 tools/pip-requires |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit a31522c88d876ed9bebffaa65238054f283a26ea
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:53:09 2011 -0500

    use 'is not None' instead of '!= None'

commit 96559eea5f2059798514b382fb9c6bce5723cce1
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:49:06 2011 -0500

    pep8 fixes

commit 5b9bc7491fdc0730315081a465abf1c32f4e8009
Author: Jason Koelker <jason@koelker.net>
Date:   Mon Apr 18 15:40:16 2011 -0500

    Change '== None' to 'is None'

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit cd8566aa9096bbb13d0f64e71e5d16ee47986ec2
Merge: e54d108 f3c1e23
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 63e8f18ce6d3c898ef622aa157a88f6fedf73878
Merge: c0f1366 e54d108
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 22:02:43 2011 +0400

    trunk merged

commit c0f13664f606d2dfc6ea90a8438be39ed9b7a252
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 22:02:12 2011 +0400

    pep8 fixed

commit 60dba4c0f5ea5ab86a98ec1dc99c6838e7cbc8eb
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 18 13:30:54 2011 -0400

    calc link local

commit 054d39de71cf3d2842f758e976d78a94ee8b929d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 21:06:29 2011 +0400

    not performing floating ip operation with auto allocated ips

commit f3c1e23a8d6d0f6915e49af19d9c46efcc655eee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 18 09:10:07 2011 -0700

    it is rename not move

commit 9a945da54a418ebdd1350cb3610c55b215b0e503
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 19:36:19 2011 +0400

    pep8 fix

commit 147e5e59b0406c8eeeb45132fabaa02825072db0
Merge: 1312926 e54d108
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 19 00:01:59 2011 +0900

    Rebased to trunk rev 995.

commit 09f4b4bbbb87684ab58f72062a46da6ac1efea2a
Merge: e7c330a e54d108
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 19 00:01:45 2011 +0900

    Rebased to trunk rev 995.

commit ff4a52fa02d353b4834dc26ddf2466aaa2a03b48
Merge: 973dbb9 e54d108
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 18 10:40:19 2011 -0400

    merge trunk

commit 214fe962d12269ee01d48281465864c7375607cb
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 18:13:56 2011 +0400

    add fault as response

commit cd62cda7ea93be6c22125177c2e41b90c8438f46
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:32:48 2011 +0400

    Fix logging in openstack api

commit 40a28af2d768e044cb9567b19cf4b1c023e5a019
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:31:29 2011 +0400

    Fix logging in openstack api

commit a804523288d9d6bf85c87d2ecca2b7cc835102cc
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 18 17:06:18 2011 +0400

    Fix logging in openstack api

commit 1445155b60013cff1aa8ec405c1e6fab8f508b79
Merge: 03c3100 2ea7276
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 15:28:42 2011 +0400

    trunk merged. conflict resolved.

commit 03c3100098fbefabd045fd882045e737c9097de1
Merge: bdae1dc db316f3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 18 15:25:44 2011 +0400

    trunk merged. conflict resolved.

commit e54d1080418145a4d586e041158830d6d5e89ef3
Merge: 85705fe 47a5e7d
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 85705fe54edb7a76d00c2ceeb1dc0b03cfe28ec1
Merge: 8a30fe4 908ca0d
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 47a5e7dea3dd7d4c9e67487f647720144df5850f
Author: termie <code@term.ie>
Date:   Sat Apr 16 20:23:06 2011 -0700

    move name into main metadata instead of properties

commit a36bfa2508834d11d3462b5e68ad2b1624e4296c
Author: termie <code@term.ie>
Date:   Sat Apr 16 20:23:06 2011 -0700

    change libvirt snapshot to new style execute

commit 8a30fe44515e1ae9704e90d4dd4ddf5adafb1dc5
Merge: 092c903 6b69532
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 f3cacb2272b9ca16e774c36cd8bf0125f6cf2b27
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Apr 15 17:32:15 2011 -0500

    Rename the id

commit cc31b463b3fc1120cd342320a414cd295af9b3a2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:36:52 2011 -0400

    Added period to docstring for metadata test.

commit e9af0be2925abed8dd88cb8f5936d98a2b93fa69
Merge: aed33c4 092c903
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:15:36 2011 -0400

    Merged trunk.

commit aed33c418e6eade2701c8024a3981f2286422564
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 15:08:18 2011 -0400

    Empty commit to hopefully regenerate launchpad diff.

commit 6b69532428b95a6e6a8690ec52b0ce833ca69a58
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.

commit 2689a12b3169f3802da94724811b940339e038c7
Merge: 12a98b5 092c903
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 15 14:57:58 2011 -0400

    Merged trunk.

commit 4742724d49be8138e456541922ee690a9bfb89bc
Merge: 6519228 092c903
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:51:10 2011 -0400

    merging trunk

commit d3acbba62b1cd7965758a689fe41b6f0d460b33f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:33:24 2011 -0400

    adding documentation & error handling

commit 91b78623b9843310e9935b96216447271503ce93
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Apr 15 14:24:17 2011 -0400

    correcting tests; pep8

commit 092c90341397f59153c412506575130bc401ab1d
Merge: e3432d8 6893532
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Apr 15 15:58:28 2011 +0000

    Removed the unused self.interfaces_xml variable.

commit e3432d830fd3ad6fee69154a6cb6370f14661f7f
Merge: 5aeae38 0b5b54f
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 5aeae3867849471bcf43f1ea35fb98ab79f42306
Merge: 7b977a9 5d97063
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 10:36:14 2011 +0000

    Diablo versioning.

commit 5d970637bb7e8a6819d2b682752975a0d0f01848
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 11:39:08 2011 +0200

    Diablo versioning

commit 1312926febab21796a2c5235daf3c76dad7744fc
Merge: 648363b 7b977a9
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 15 13:33:34 2011 +0900

    Rebased to trunk rev 989.

commit e7c330a667fc365b7c4f99dfc6ae81fc5e6ce3fb
Merge: 32ee40d 7b977a9
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 15 13:32:39 2011 +0900

    Rebased to trunk rev 989.

commit 7b977a9f37c4217279b8ae740261db768c355185
Merge: db316f3 f496f2d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 15 02:47:01 2011 +0000

    Final versioning for Cactus

commit b42c378c44b5d24e3d55fb53bbf6cc98b8653b0d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Apr 14 17:34:09 2011 -0400

    initial roundup of all 'exception.Invalid' cases

commit 973dbb957ca1ab59803ff57859acfc65a7c5e4ad
Merge: 922f3f5 db316f3
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 14 14:36:10 2011 -0400

    merge trunk

commit 922f3f58895d7fc2febee47245a67cc420efda4c
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Apr 14 14:35:42 2011 -0400

    set the bridge on each OvsFlow

commit 41d736f1dbe5152afd3ea4e23c277cead6cd89ed
Merge: d7f8b65 db316f3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 21:29:40 2011 +0400

    merge with trunk

commit d7f8b657f3ac7905b7e45237adceada6b6212d86
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 21:23:40 2011 +0400

    bugfix

commit 5ca27eea77a7564f279e64f3a77656cdcb92f110
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Apr 14 17:12:54 2011 +0400

    bugfix

commit 908ca0d3d5f0d0c128ae09fe9caacc0c4a04fcaa
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.

commit f716534cbf01d0991da71dad725f7d2dacb28eb1
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Apr 14 20:57:11 2011 +0900

    add kvm-pause and kvm-suspend

commit db316f3b961c47c295cf7e75a82744323f433373
Merge: 8dfb8c7 ada2546
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 648363b4d554488b0afbb9b780592babfecc53e9
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 10:47:37 2011 +0900

    Updated following to RIck's comments.

commit fdc982d250bfc56bbb311233c38a992d2980ca94
Merge: aa0c6e6 8dfb8c7
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 10:17:38 2011 +0900

    Rebased to trunk rev 987.

commit ada2546f48b446387d20bb339b20378577bcd3d1
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...

commit 8dfb8c71a83346725f4473e3ad5ef1d8e2da6123
Merge: 251f4f2 76f6232
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 0d488aa3769a956ca164c15d8226400e2345058e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 12:01:59 2011 -0700

    pep8

commit a31fdeac564234ff2769be003eb51e8559f00e1a
Merge: 8ec1abf 251f4f2
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 11:51:36 2011 -0700

    merge trunk

commit 8ec1abf756712bca6e83f1734fda75f5ceb5f458
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 13 11:51:03 2011 -0700

    fixed error message i18n-ization. added test.

commit 76f6232ba13bebfcdbf745bc01e1b031ab7fc126
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 13 13:35:32 2011 -0500

    Don't hammer on the DB

commit 32ee40d54074366a8cc8350fc988b08e0986a57a
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:38:14 2011 +0900

    Debug code clean up.

commit f2e9d4464f17158b1170f589dc99fdd35221d7fc
Merge: 110e971 251f4f2
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:32:52 2011 +0900

    Rebased to trunk rev 986.

commit 110e971df306d3ab19fe54f02fe515429dcb67cd
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 14 02:22:41 2011 +0900

    An ultimate workaround workd... :(

commit 251f4f22a6da11ee9eaf6831016f4941315deec7
Merge: 7f1bca0 66af9cd
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 542ad2f4eee2bb292aa9ef57c7416f6efec8e149
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Wed Apr 13 10:10:40 2011 -0700

    Minor formatting cleanup

commit 66af9cd93f6701a232965fc0d93fe1c8c499f964
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Apr 13 12:03:55 2011 -0500

    jesse@aire.local to mailmap

 .mailmap |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b8ad3b8df99616bd1c79586cab2fb3b9f0243163
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 files changed, 2 insertions(+), 2 deletions(-)

commit e91ef5ad79820020b445fd5beac2b7f65352460f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Apr 13 11:31:28 2011 -0500

    re-add broken code

commit 37fb174c54dc9b0ac1d00f85722f0561b4feff82
Merge: e53e994 7f1bca0
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Apr 13 10:32:39 2011 -0400

    merge trunk

commit f496f2d68f6288a2932a5c17d77fa439fc4eee2d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Apr 13 10:33:56 2011 +0200

    Final versioning

commit 7f1bca01c36e4442c5daa7fe8e63231962016423
Merge: 12988bf 53687d5
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 c20c3edc7b94b07844b4b6b3f20b7c2d32033e54
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 14:51:26 2011 +0900

    iSCSI/KVM test completed.

commit 928e84c0fe205542c053ac77510f02ed6e1b2821
Author: Renuka Apte <renuka.apte@citrix.com>
Date:   Tue Apr 12 15:20:30 2011 -0700

    Minor fixes

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 12988bfd56a72e8cc4e1a0d792f833476efbabf9
Merge: d39c8dc cb8a36e
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 d39c8dcc400ebe0c34abc4f29f1ff9240cdd85d4
Merge: 8cc9879 c71028d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 22:01:39 2011 +0000

    Fixes VMware Connection to inherit from ComputeDriver

commit 8cc9879f90a4fb3d64e98926d659c09e5e224efc
Merge: 2945f86 3457461
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 7045295240e8fb7ac577496e42b9b3920b8336b3
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Apr 12 16:46:18 2011 -0500

    move from try_execute to _execute

commit c71028d7ca93b7517951b9b6634f49d8039f326d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 14:43:07 2011 -0700

    Make VMWare Connection inherit from ComputeDriver

commit 53687d5d6baacdeaaf0b4875223278b50a14ede2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 12 20:33:33 2011 +0000

    add up and down .sh

commit 3457461d1bc43f91c9f3e594e50074fa93431f9b
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

commit 7abaaffd1de35f317d8f14461b83c3ad10a54f06
Author: termie <code@term.ie>
Date:   Tue Apr 12 13:08:48 2011 -0500

    remove extra newline

commit b02640271dc3645048bcc9d042cd994aabb8d0f7
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 12 13:47:45 2011 -0400

    dots.

commit a6ccc56a2717708c8039daba612edf163413ddb5
Merge: a3c5c00 89393d3
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:42:37 2011 +0900

    Rebased to trunk rev 980.

commit a3c5c00545d3888d273a06695cd1b74a6bd267b5
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:41:33 2011 +0900

    Rework importing volume_manager.

commit aa0c6e69e7fad02684622976476b50039e41ec1b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Wed Apr 13 02:11:36 2011 +0900

    Blushed up a little bit.

commit 0b5b54fea0879225afbdabd89e049199d2212cb8
Merge: 01fe046 2945f86
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Apr 12 11:25:07 2011 -0500

    Merged trunk

commit 01fe046582b4c700c148c306b7b9aac0a7da5365
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.

commit 3ef24034f353bacec52164342fd586fce460cf3f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:47:08 2011 -0400

    Added some tests.

commit cf06d130daa9f61177a09c5419729848a3eb9598
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:13:31 2011 -0400

    Dangerous whitespace mistake! :)

commit f01b380a16db4c78b3a3edecdb02fdff6870a5a1
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 11:09:31 2011 -0400

    Cleanup after prereq merge.

commit 2ac58aa9998f89e77d26a151cb6840b73e2f0e86
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

commit bbe701410d969fa6649765f359973253ff4fc315
Merge: e63a53d 89393d3
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 23:42:18 2011 +0900

    Rebased to trunk rev 980.

commit 2e376f0f1393929a9cc35eda3a4ace74ab0a561d
Merge: 91d1840 4f49df8
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 4f49df85186eaeb482bcfeee4f3efc1c162f3ce3
Merge: 4ad7cd2 89393d3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 10:38:15 2011 -0400

    Merged trunk.

commit 2945f861ce7fe3cbfb6140127fdfd921cf9c57b0
Merge: 89393d3 3d69a51
Author: termie <code@term.ie>
Date:   Tue Apr 12 14:32:03 2011 +0000

    Docstring cleanup and formatting. Minor style fixes as well.

commit a0e6867049823d67c121ab02fb4d7dd7fd10b1d0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 12 10:25:07 2011 -0400

    Updated to use setfacl instead of chown.

commit 91d184062f1d38e782a36af79168b8def60faf99
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 10:19:37 2011 -0400

    Commit for merge of metadata_quotas preq.

commit e53e99457c06c7f1a90300e7230c1abfb899b009
Merge: df3f34c 89393d3
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Apr 12 09:59:02 2011 -0400

    merge trunk

commit 011a450bef931774149d74ddce002833f4ca622c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:37:06 2011 -0400

    Removed extra call from try/except.

commit 104bac0cb00c7083ed165808a0d3705e45922e85
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.

commit d56ebdbcd8ea77346fe3a68a59b5b26da0fa12e7
Merge: af38e10 89393d3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Apr 12 09:24:49 2011 -0400

    Merged trunk.

commit af38e10be0a15e798e2ad4be4462334b323be816
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.

commit 89393d3b15ecb6b247e226b38d59fb8c379ec8e9
Merge: ce57bfa 242d007
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 ce57bfaa94334b6dc4fb728b904d226d3f322ecb
Merge: d0163de 9a96e67
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Apr 12 07:48:21 2011 +0000

    Add a unit test for terminate_instances.

commit 242d0074680f63a259947e608dedd0d250fada5e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 12 09:41:42 2011 +0200

    pep8

commit cb8a36e91f0b583f836a6fe633418241b54c2699
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c7bffa89bd85ff2fa961f52fc36070774e5e79d0
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 12 03:07:22 2011 +0400

    pep8 fixes

commit 9bd9b1c2d3e28243f6aaa4842877a215cf7b2fc2
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 12 02:44:44 2011 +0400

    migaration and pep8 fixes

commit c0d3162c5e2ab07fc57812e066eece599f604a3e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Apr 11 21:43:12 2011 +0000

    update documentation on cloudpipe

commit d0163ded40c74eff74437ddbc7b78edc76a0936a
Merge: 861c861 99c9eae
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 d13ad7be0d8974b6542bff5b31d8495c5da69bfd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 15:26:44 2011 -0500

    typo

commit c623f29bd280e2c3b52980bcc92748eb5d5116b3
Merge: 231a30e 861c861
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Apr 11 16:14:39 2011 -0400

    Merged trunk.

commit 22a6ca84609f5ef93eff63c5ef54d1984dac56b1
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Apr 11 15:04:00 2011 -0500

    Updating the runnova information and fixing bug 753352

commit 2bea0348ac3a296d22a2071bf2424151a76eb292
Merge: 879ffab 861c861
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 14:36:25 2011 -0500

    merge trunk

commit 879ffab98a200819a1d97dffdd569387809c6542
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Apr 11 14:16:30 2011 -0500

    network manager changes, compute changes, various other

commit e6d3f643030f8258b94a1396682d3e27124c092b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 11 22:35:09 2011 +0400

    Floating ips auto assignment

commit 79a2c896d5084c59d9f11e07da9bcd5376852335
Author: Dan Prince <dan.prince@rackspace.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.

commit c80af3c818cd7c3d4223f904ab3f904dbe5ac976
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 03:13:58 2011 +0900

    Minor blush ups.

commit 97080dfb1ffd3b9e08508ea3058415a54f00b629
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:32:19 2011 +0900

    A minor blush up.

commit b46b81b98f5d7bbf267e91c33c4ff547058f0d0d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:30:31 2011 +0900

    A minor blush up.

commit 6893532eebe2f0d0765d1ba547fb8e1560af60b4
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Apr 11 12:15:22 2011 -0500

    Remove unused self.interfaces_xml

commit 5585ab09ca68fd680b6beb9c01b69c1c42f5fe67
Merge: 4139039 861c861
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:10:48 2011 +0900

    Rebased to trunk rev 977.

commit 4139039cfef32a531850c5cd02c6c42b9be127eb
Merge: cc23420 73d2773
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:09:57 2011 +0900

    Rebase to trunk rev 937.

commit cc23420a37aab2c43070a4a861b2315ac766ddeb
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 12 02:09:29 2011 +0900

    debug tree status checkpoint 2.

commit 3d69a513e0deb229ace7ab26204a6c4a687e284c
Author: termie <code@term.ie>
Date:   Mon Apr 11 11:34:19 2011 -0500

    docstring cleanup, direct api, part of compute

commit 861c8612e552d1eb39546e5c4e1ad865cb5fd0ab
Merge: 06e73cd 740d280
Author: Dan Prince <dan.prince@rackspace.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 99c9eae8ff14dc38fd85414a33d92675d698ed76
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

commit 06e73cdfd292fa24044790c20c40ddde04f0394e
Merge: 3bad9d9 0e2b65e
Author: Dan Prince <dan.prince@rackspace.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 df3f34c3ef5390bee91278b7968bf4ebc15b1dfe
Merge: 7ccffdd 3bad9d9
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 11 14:56:42 2011 +0000

    merge trunk

commit 3bad9d90394ef4312e799a7ed1949d3f5c5179c7
Merge: c0ba1c5 984c2f5
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 aacbeab0b7245905c1521d4df797f9ccdb85f128
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.

commit c0ba1c5770b197ff36fc7b52a8f0b3c0e20c81f3
Merge: 73d2773 296c0bb
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 e63a53d301eb81ea3893c1fcbcdc5110bd87aeab
Merge: a388a85 73d2773
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Mon Apr 11 23:00:53 2011 +0900

    Rebased to trunk rev 973.

commit 73d27734844785478340f1308ef2583c602a10bc
Merge: 0b6aa56 87e7c3f
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 1d52e2b2f5278121c371c48c23223481ccb281d7
Merge: 8ad5212 0b6aa56
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Apr 10 14:34:25 2011 -0700

    merge trunk

commit 0b6aa5674742fcb9b33a8b95dbea086a473f3bf9
Merge: 2ec1ff0 90d0e16
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 296c0bbfdb02bd0039cd0caa5465bc514169afad
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

commit 2bf10c84a5fbc4240a332fc2749218f5416a6080
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 12:41:30 2011 -0700

    Handle the case when the machine is already SHUTOFF

commit dde9e7052b56830367f86e71e685b2b8c9e4d052
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

commit a6cafaf35511c0ff0bfcf9912e8effcd547d3836
Author: Justin SB <justin@fathomdb.com>
Date:   Sat Apr 9 11:57:14 2011 -0700

    Remove the XML definition when we destroy a machine

commit 40020d85823e192e89dbda7ec47917ec6721eb44
Merge: 12fdc5f 2ec1ff0
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 02:50:22 2011 +0900

    Rebased to trunk rev 971

commit 12fdc5f8f8d2c0ea625d45dc602429da3e3eebf6
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 02:49:38 2011 +0900

    debug tree status checkpoint.

commit a388a85ce711ca77d00d55fde8e44aa0d86f9e0e
Merge: 0e417a8 2ec1ff0
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sun Apr 10 01:25:26 2011 +0900

    Reabased to trunk rev 971.

commit 87e7c3f3de55d49d74b851da0ed63609b2050b1f
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Sat Apr 9 11:08:47 2011 -0400

    Fixed log message gaffe.

commit fd721b1f593ba8ae324d908346091ccdd75f621f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 15:24:09 2011 -0700

    pylintage

commit c6809eb605a311ded3b6c75c8c9c562b1acf0aa7
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 :-/

commit ccb038af3b69c25f7b7a30befedb44daf964d8cf
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

commit 2ec1ff0a6b43604f9c3c4a203c7928aa78ca2eba
Merge: f7ba09f 2ef9160
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 90b9d70ac6fa260a1606da5ec83c696bb2f2e116
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Apr 8 14:53:54 2011 -0700

    zero out volumes on delete using dd

commit f7ba09f4e04cae5e60ff2bff6c9a2c045e7bd762
Merge: f74f51d 5ad9612
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 21:48:31 2011 +0000

    Added RST file on using Zones.

commit e62883ca7dea7f3f1c148eb0f94b4f25980dca7d
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.

commit 90d0e1631b4569de6f28a8d831e20fdea4e1b007
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 14:36:27 2011 -0700

    pep8

commit ec58144552bee3d3838db9605a586f0f6d348975
Merge: 37f3992 f74f51d
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Apr 8 14:35:30 2011 -0700

    merge trunk

commit f74f51d08af021437da543ead9bb014f71c74c28
Merge: 9c9035f 2b7046e
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 cb7537b65f3569511447146d2103ad397a263003
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Apr 8 15:54:17 2011 -0400

    Added error message to exception logging.

commit 113d687641524bfcb9730464821141c5c5b5f31d
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.

commit 5ad9612c52e0cc506cad76acef01db60ad0290f3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 15:45:42 2011 -0300

    missing 'to'

commit 2ef91605f5324495fc8089721eaa4a3d12f1d122
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

commit 9c9035fb88a7118545ed0ad9a0b4e86a22b558ac
Merge: 5cb9492 aeb1bd2
Author: John Tran <jtran@attinteractive.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 984c2f5534d87061748461bc21bfe624f4762920
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Apr 9 02:39:18 2011 +0900

    fixed LOG level and log message phrase

commit 921971803689d278d9f07a99d2f455fee8a1c3f3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 13:45:19 2011 -0300

    merge prop tweaks 2

commit 0e2b65e5003614ab7d4b79ce1a30bd308500fb82
Author: Dan Prince <dan.prince@rackspace.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.

commit 5cb94929574c92b1d8ab7cf4baac04337bf1403b
Merge: 7fa0491 7839d3b
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 7fa0491c7efdf9e3f9b51230710ac19c07de994d
Merge: d987dff b9af0a3
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Apr 8 16:01:24 2011 +0000

    Ignore errors when deleting the default route in the ensure_bridge function.

commit 740d2801d40991cda91669aa6753ae4a9ac545dc
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Apr 8 09:50:16 2011 -0400

    bzr ignore the CA dir.

 .bzrignore |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

commit 8a75278bc0344685b8bda4a70c6028f42ce52d6b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 10:04:38 2011 -0300

    merge prop tweaks

commit d987dffe393066999e2848ea7607b7b5b704c4d9
Merge: 10dc3b7 69fea0d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 8 11:53:52 2011 +0000

    Import translations from Launchpad.

commit 2cdca2b55d92604a022a4952a3087e7caa3321fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Apr 8 08:50:45 2011 -0300

    added Zones doc

commit 10dc3b7e34cf8a2b6a0c14a571c349e9e8cf281f
Merge: 84d2929 a623f55
Author: Dan Prince <dan.prince@rackspace.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 69fea0de236dccc2cf3b38c40cb0e46d242503f3
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Apr 8 10:42:01 2011 +0200

    Import from lp:~nova-core/nova/translations

commit 84d29296d76c669a4b181cda83e005465f1d09cb
Merge: ec4be41 f3a6e84
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 ec4be419753e00a23840f5c935937ef25c15f519
Merge: 0c48fd3 f00e174
Author: Dan Prince <dan.prince@rackspace.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 a623f556c34bbae257ee4fe844dc746d32ecdd13
Author: Dan Prince <dan.prince@rackspace.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.

commit b9af0a3d907487a146ecc9db428b0adb335e275d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Apr 7 21:44:41 2011 -0400

    Ignore errors when deleting the default route in the ensure_bridge function.

commit 2b7046ed47ba5cbd0c726c914d2879004c8e7248
Merge: 735def1 0c48fd3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 18:05:10 2011 -0700

    merge trunk

commit 735def1ee3441383a6e7f09ed68740bb8e261a1d
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.

commit 8ad5212c52d39e1595d0c1f34e648350c6a1e50e
Merge: df397c2 0c48fd3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 17:59:10 2011 -0700

    merge trunk

commit df397c21bc5d91659f1a67a180e592d0c7184c66
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 17:38:24 2011 -0700

    reminde admins of --purge option

commit 0c48fd3174985f629efa857c54077c778556e89a
Merge: 6f83c46 faf683e
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 6f83c4673cba22b1cf47661c4388fa07c3659686
Merge: fe9c631 80b2ded
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 23:52:48 2011 +0000

    Keep guest instances when libvirt host restarts

commit faf683ece932d69c4a75adc0cfd0b8d2a7f0190c
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

commit 3fb3a859e14e98baa15332c67001ea3f0249ea12
Merge: 4cacd1e fe9c631
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 7 16:08:55 2011 -0700

    Merge from trunk

commit 4cacd1eb367881603bf4601857f3538b411d0a96
Merge: f3dd8da e5d0824
Author: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date:   Thu Apr 7 16:08:15 2011 -0700

    Merge with lp:nova

commit fe9c6312b61318abb737ca9491f353f1a61e308f
Merge: 4ef108d caca6c6
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 80b2dedd6671f505486e666de6f25b0e1fc906c2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Apr 7 16:00:55 2011 -0700

    Log libvirt errcode on exception

commit 4ef108d542a49e10771cf3e63f0e7e07971321d8
Merge: e5d0824 167366c
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 d9041afbb9e9eef18eaa07df06cdc9697b03072c
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

commit 9805081ec8be9e3e95a8cd298e8dd1ac4071651e
Merge: 0fe5d24 e5d0824
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 15:54:14 2011 -0700

    merged trunk

commit 6b823c9ff0631977a0592a5a10c3f6c215f07e6c
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

commit e5d08240a3472ba92575bf656d9e49a6f552ee9c
Merge: 9b12360 a98ba16
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 ea663700fa222d79ba7f113dd65058c0567c211c
Merge: 38b0214 9b12360
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 15:09:48 2011 -0700

    merged trunk and resolved conflict

commit 38b02143fa2f711b9eb395e4885979e3349199bb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Apr 7 15:08:29 2011 -0700

    slight typo

commit a813981402eed64698c2e6cbcd759e9d0f556987
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

commit 9b12360683676814f971f1b3dddb62e5e98614c7
Merge: ed6f786 d97f449
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 d97f449799838734c614da1912f95ee8191adbfc
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Apr 8 06:32:53 2011 +0900

    fix pep8 violation

commit ed6f786a354c02d179953170dc36769553190fc3
Merge: 5728d19 9462153
Author: Dan Prince <dan.prince@rackspace.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 946215304a6e1570087dce9e54c77c4f3ac0a441
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Apr 7 15:52:14 2011 -0400

    Drop extra 'None' arg from dict.get call.

commit def62b73ebd2d8bd2ab94b0b86972d8b6e8880d6
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Apr 7 15:43:51 2011 -0400

    Some i18n fixes to instance_types.

commit 5728d197b8699a1bcff932d0066245afc6ac05e8
Merge: 0d1a709 29ffe32
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 0d1a709a9c711f90021add1cbab3a1afe1f49108
Merge: 7940103 8816996
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 87b063901dd44dc41362a3ebc70b49d3e242e7ad
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Apr 7 15:09:10 2011 -0400

    Drop unneeded Fkey on InstanceTypes.id.

commit 7940103329e12eede989b47e2bdd0c2dbc801811
Merge: 7ecea5f 56e735c
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 29ffe324c04d9bd08da69bd4fa6ef3c10ca19d74
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Apr 7 13:55:42 2011 -0500

    Renamed computeFault to cloudServersFault

commit 7ecea5ff400737430eacd310dfedee918569a181
Merge: 944dcb1 51a9afe
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 29ca89b33da62c0849f23c8dd1586ac98c168dc1
Merge: 5f2316f 944dcb1
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Apr 7 14:28:53 2011 -0400

    Merge w/ trunk.

commit 37f39924dfcd177c57ef2fcd5196ed9dda4feff5
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

commit aced2db307f45f23ad1708491d29b7b206d3207f
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.

commit 8f819aeb456aa8a834278f5e635a9bac42bcbec1
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

commit 167366c1e8f74b76ff9f133f7c548fca78e0e318
Merge: c43446f 944dcb1
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Apr 7 14:08:04 2011 -0400

    Merge from trunk

commit a98ba169071958c9ab8c65e3366f3a30526182d9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Apr 7 10:37:40 2011 -0700

    Simplify by always adding to loopback

commit 944dcb11e0f30621d223b976a13c49b22c70b2fd
Merge: f3a323b ae46e16
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 b11fef9ab41bc3575fe189d3a26930552e512beb
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Apr 7 13:22:03 2011 -0400

    remove unused code.

commit 6024ecc945715d8f09f66a8deba1405da03b1d61
Merge: 793c0f5 f3a323b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Apr 7 13:17:13 2011 -0400

    Merge trunk.

commit 8816996089aa421fdb37c28befc34f60147ad437
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 11:59:40 2011 -0300

    better error message

commit 0e417a8e5fe769147510cb955dd6fe39ed657ffe
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 23:48:00 2011 +0900

    Blush up a bit.

commit ae46e165e04dcebf1c2ca2bc86296b6c3f83a760
Merge: 60cdcf7 f3a323b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 22:51:48 2011 +0900

    Rebased to trunk rev 949.

commit a919581c0624113db32b47afc00db999d1719c4c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 10:42:29 2011 -0300

    pep8

commit d7d426db2a41effd4aeb888ad554bd12b7d5477f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Apr 7 10:34:14 2011 -0300

    adds timeout to login_with_password

commit 793c0f5c7608805f7be242564e37d10c2d3e6a49
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.

commit 74de868377d7b6970146839bf31d446a36490511
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

commit 3fe3df33561d7eeff84e10be2ccb98effc4d82f9
Merge: 6050615 f3a323b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 13:10:10 2011 +0900

    Rebased to trunk rev 949.

commit 143c81e3b904cf1c999286d4bbd5f363473a8d10
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 _()

commit 241d87ba4ea690ca503c4d68c1651aa226097a11
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Apr 7 12:35:45 2011 +0900

    Make description of volume_id more generic.

commit 0c77de4fcefc16c064e898f7177f87f930db470b
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Apr 6 19:43:58 2011 -0700

    add the tests

commit 6050615066f7425f266542a96741afd284b62bab
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Apr 7 11:42:02 2011 +0900

    pep8 cleanup.

commit e7b2a8d444b8a9763be4dd9ef08cf5bb5bd0d580
Author: John Tran <jtran@attinteractive.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

commit 5adfd68ca4d29a52457c10860e462e604402be58
Author: John Tran <jtran@attinteractive.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

commit 9cb2fe6b2a4a26c188128db82574cfa8b494028e
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

commit f3a6e8461856142e929c2f62284a74975fea1dfa
Merge: d1353c9 f3a323b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 6 15:55:55 2011 -0700

    merged trunk

commit d1353c91400616345e506013e5d2147e0415dc2a
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Apr 6 15:39:44 2011 -0700

    removed comment on API compliance

commit c6bedc8f6a2dc4917ce38af6f7c291ffebe7572e
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 files changed, 20 insertions(+), 7 deletions(-)

commit b9dfdf637fa5bcfa42ef6b9204ae15dd43d716e8
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

commit caca6c6bc6f46a0b2fb5b732620713f3ef7c1101
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:50:11 2011 -0400

    Controllers now inherit from nova.api.openstack.common.OpenstackController.

commit 231a30e07b5e29a9cf6b9d18d5b575e7cc89383a
Merge: dd5fe7a f3a323b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Apr 6 17:39:10 2011 -0400

    Merged trunk.

commit 2677e75804337df5c6bdfa33c8a6d87bf8cef5ce
Merge: 514bdfe c43446f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:28:13 2011 -0400

    Merge from trunk

commit c43446f4cb26c4ff5063e7b01c4e6e335f1e636b
Merge: 2728d54 f3a323b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Apr 6 17:26:50 2011 -0400

    Merge from trunk

commit f3a323b8c3e668f0142397bd6cb464f711f7530c
Merge: 46a8e1d a90a4f2
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 a90a4f20d24bfc8a65b6624ff42fe3b773bba13c
Merge: 3cd34b5 46a8e1d
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 514bdfe5d1393fb8866858a96c986f67c415572a
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.

commit 0fe5d24b354fca7725774cb0ceef05bfe0f47cc0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Apr 6 12:58:57 2011 -0700

    check visibility on delete and update

commit 4ad7cd28b9c40463dc01dc388c730e1d5e26db7e
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Apr 6 15:42:24 2011 -0400

    YADU (Yet Another Docstring Update).

commit 46a8e1d70916d6979cddb0409c6dd58a6601bbc6
Merge: b61e036 7e2ca9b
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 9afc3312c483147906d8459c686e60e3d5b121f4
Merge: 0020f97 b61e036
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Apr 6 15:36:58 2011 -0400

    Merge w/ trunk.

commit 51a9afe8249555808b541ed141589718edaaaa7c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 13:43:02 2011 -0500

    another syntax error

commit f3dd8da0f3e0344c9b0febadb15898d6540361b0
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

commit 12a98b5af5517927837eaedb2b480f68dfa584bf
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.

commit 168dbbc8a8126e98c34f9ba3cfd8a84ab269f3b6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Apr 6 13:31:51 2011 -0500

    syntax error

commit 56e735c200207ca9afa83b7fdf23f4fbfcb7b11e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Apr 6 13:27:43 2011 -0500

    Incorprate johannes.erdfelt's patch

commit c73c8f23c385c9382e6647e077d9f626fbe6cadb
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

commit 5663f3fd1d17fa3e35e9acd8115f9eae0496da3b
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

commit 52be788ace2feff4bbbc8dcb807f83c751070b3a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Apr 6 13:42:04 2011 -0400

    add docstrings

commit 752558a1176bfcce137b30ae8988058cc00484e9
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

commit bb36003092d416e30cdfb0a37bb7b5a36341b8c6
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.

commit 6a4a5ff368d58f319bdceeb4416d33b9178f5e57
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

commit 7e2ca9bc08de3f83f5ee918de3f83ba037f7797d
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.

commit 2f5a0097ae2f0d8b12046acd94b0cf0f15c95248
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

commit d2b7792680a943eb057b97f09605f833f6e00120
Merge: 7a8074c cc3a6f0
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 b61e036850c444431c42469c2c17b175131316e9
Merge: 4493b84 0809319
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 08093190988fe82ae510d39c7e235b9def6fb523
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 14:41:26 2011 +0200

    Added bug reference

commit ab315441e138d26abd7d65779a5b88fd9e51bebf
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.

commit b07b361d77ef079f87c4cce3a542a0383b1de075
Merge: ac322f8 4493b84
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Apr 6 13:15:23 2011 +0200

    Merge trunk

commit 4493b84c30a3c123472994e844e642de6767c277
Merge: 6e43cc0 170e25e
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 7839d3b1c7e39aabddebe1fb74d2e0dcd46dd9cd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Apr 6 14:44:19 2011 +0900

    fixed based on reviwer's comment

commit d0adc5d0bcd78dea855b8e174aa04e3dd6afd965
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Apr 5 19:21:05 2011 -0700

    return image create response as image dict

commit aeb1bd2696fc3079c2d183b349c69d967241d78e
Author: John Tran <jtran@attinteractive.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(+), 0 deletions(-)

commit 7ca41ddca3c3da2d8c140209dfd6ca73bc530da6
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 20:07:46 2011 -0400

    Undo use of $ in chain name where not needed.

commit 578ecd2e15b1d94802933fcf340b176a1b13d643
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 20:03:29 2011 -0400

    Testing for iptables manager changes.

commit 314bcf21500b59cee1ed2f0a57aa8a88170b2a1f
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.

commit b08e51a51471c8a1845cec1799761deb63ac69b4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Apr 5 18:29:53 2011 -0500

    typo

commit 782144aad5e329c3ed1b6d35b04d29f1986ecd72
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:58:19 2011 -0700

    remove -None for user roles

commit c88dfe6ddeedc0f6a36fac63fdcf31023c5ebc38
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:49:43 2011 -0700

    pep8

commit 9c25118b1200b6a6d4b0b09f6200fd7ff7322c5d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:45:01 2011 -0700

    fallback to status if image_state is not set

commit 7ec042d0d9b37488912fa8bcd211febe3edf722b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:35:17 2011 -0700

    update and fix tests

commit 99e9a6e38615015eba4b953359feec69e8143ade
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 15:01:33 2011 -0700

    unite the filtering done by glance client and s3

commit 2728d542894d7635f5c2962906eaf4143d2cbb80
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Apr 5 17:49:38 2011 -0400

    Removing naughty semicolon.

commit fa57a5a3763f3c2c168a9c8c956666cb835a4f44
Merge: 88f2f48 6e43cc0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Apr 5 17:48:38 2011 -0400

    Merge from trunk

commit c8d3bff80b9f7ddb1f18b45cce25a756dbb2f5ec
Merge: 4387a97 6e43cc0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 14:44:39 2011 -0700

    merged trunk

commit c0fe22d03be4584b6cbaec23faba929e39ac2e42
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:53:59 2011 -0400

    remove extraneous empty lines

commit 98e4526c412209f8d8d54734d83d2772dd1960b4
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:46:44 2011 -0400

    move error handling down into get_password function

commit 4cac74280664e5d0bc7ac91e1461a7ba46e14d09
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 16:30:30 2011 -0400

    refactor to handle invalid adminPass

commit 8dc1f1ad6ac54844282a9b15add6908b074cefe1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 12:56:25 2011 -0700

    fixed comment

commit d0d7277e84eac589232c67c3038cad4243007395
Merge: 2748a6b 6e43cc0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Apr 5 12:55:57 2011 -0700

    merged trunk

commit 44a937d005e9e544f7bb736dcd4e311679d92395
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

commit 724bf14de6598449b4eea28771cbfb6e55bc6f01
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Apr 5 15:44:41 2011 -0400

    add tests for adminPass on server create

commit c0b19e65c44386a640e6719573a7daead226b857
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 15:17:37 2011 -0400

    Fix a giant batch of copypasta.

commit 6823070d76dabef235bf86548c456e97538c2165
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Apr 5 15:17:17 2011 -0400

    Remove file leftover from conflict.

commit 651922812d8895f51416fd9654a324721c16eea5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Apr 5 14:47:06 2011 -0400

    adding support for OSAPI v1.1 limits resource

commit 6e43cc00ff4b091f28e28d8e8f2640cb63886043
Merge: 7802f1a 91a629a
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 7802f1ac5244ba3f8354691b9773e6a6c64c9180
Merge: d128966 ea9830f
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 5f2316ff26286b0390805b9cf3f3ef964fc37f3c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 5 13:02:42 2011 -0400

    Remove comments.

commit d12896671d40eccbd4e907f316b6105585d0a4c9
Merge: cc3a6f0 ac322f8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 16:47:39 2011 +0000

    Separate CA/ dir into code and state.

commit 2ea7276019d930fce6b25ccab0110b54d5c660a9
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 5 20:40:52 2011 +0400

    removed blank lines for pep8 fix

commit bdae1dc2f192080f935c3e63fd5ddf5533eface3
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Apr 5 19:42:09 2011 +0400

    pep8 fixed

commit 88f2f482d4b80534a15ff95721f13e983ebcc3ae
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.

commit ea9830f15baa4ea5a6cbb34cd8a892ef7d6630fb
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Apr 5 10:17:29 2011 -0400

    Dont configure vnc if we are using lxc

commit 170e25ebe6325d2a8e0f1a91ee8c3e2886255fb2
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.

commit 83d4ab729364bb527c4f12e85b7921ed80f5e13f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Apr 5 14:54:49 2011 +0200

    Add bug reference

commit 4dbe2c588c541b064e8cb0eecfb0aa3792eedc9f
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 -----------------------------------------------------
 1 files changed, 0 insertions(+), 101 deletions(-)

commit 20ffa71576c9388ca5f4bc677ef960fa3ea0a506
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 files changed, 15 insertions(+), 0 deletions(-)

commit 0020f97d7b39450bc7d475757a033b789dbb75a5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 5 08:49:44 2011 -0400

    Nits.

commit e18d192b58cb3cd140c7c98e8b3bc39bfaf1beec
Merge: c9750f2 cc3a6f0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 5 08:43:44 2011 -0400

    Merge w/ trunk.

commit f00e1744970f07dd5ce3df3d44ab5e0278109dc7
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 5 08:26:16 2011 -0400

    Add missing underscore.

commit 333977ea8223bfd32751b5cd444913ed09aaa327
Merge: c0b23f2 cc3a6f0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Apr 5 08:24:46 2011 -0400

    Merge w/ trunk.

commit 56152e1afc349c8e6d60e769ba57ca1d5f2635c9
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:39:22 2011 +0900

    fix bug lp751242

commit cef2dbf1141f86aadd8b33035d62ab26b722334d
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:20:32 2011 +0900

    fix bug lp751231

commit ac322f85813196b7801649982b05aab23abc5816
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.

commit bb6369933bf384aa7b5e8757e757ae2b40053cbd
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Apr 5 20:10:10 2011 +0900

    fix bug 746821

commit 60cdcf7c3b570577ab3aecf13b49779c76a63016
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.

commit 7c3de93922952d55cd9ff0ab7f1675cd7cacc7cd
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 +-
 8 files changed, 1 insertions(+), 208 deletions(-)

commit 91a629abb25d505300f0ebe805f44b39c089d8c7
Merge: acb552b cc3a6f0
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Tue Apr 5 11:40:35 2011 +0900

    Rebased to trunk 942.

commit cc3a6f0669774c7b32cb876da5341b7b7a2f1987
Merge: e23cc82 c47ca4c
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Apr 5 02:31:02 2011 +0000

    fix bug lp:682888 - DescribeImages has no unit tests.

commit c3b292a9487297c9b820ae76c40772decda2a02e
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Apr 4 22:16:53 2011 -0400

    Correct variable name.

commit 3abe63a1a2270ab75d0e05e2867da776e126eb3d
Merge: e26483f e23cc82
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Apr 4 21:12:57 2011 -0400

    Merge trunk.

commit e82d4c2c4984c70320c3d23bc5a5f7a148483628
Merge: db77460 e23cc82
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Apr 4 20:29:02 2011 -0400

    Merge w/ trunk.

commit a1c7059b08d744fb1cb806a61eeded961c16080c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 16:07:39 2011 -0700

    correct test for numeric/string metadata value conversion

commit e2345497a55fe6b2d06e4b76a0726ed1153e17c8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 16:00:59 2011 -0700

    openstack api metadata responses must be strings

commit c318385fac6324d38acb44c057bc1ee5e85826a0
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 15:58:41 2011 -0700

    openstack api requires uppercase image format status responses

commit 7ccffdde9e396517f06d290feb607e1fd3003980
Merge: 08a2b71 e23cc82
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Apr 4 20:41:14 2011 +0000

    merge trunk

commit db77460f3d2de3c3d59eb2e8edca43b51f02bcfc
Author: Dan Prince <dan.prince@rackspace.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.

commit d602e21d8d3c4a84724b2c1c2b4b65855e6b5bc0
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 23:43:26 2011 +0400

    splitting test_get_nic_for_xml into two functions

commit e23cc826c4996acaf1e86c9b39d8ebd70613453d
Merge: 6b02ec1 e777665
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 19:37:46 2011 +0000

    Network injection check fixed in libvirt driver.

commit dd5fe7a1b705ccc079cf1b76583494294380e350
Merge: 2765079 6b02ec1
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Apr 4 15:24:34 2011 -0400

    merging trunk

commit 27650796b2c14ded2b6647112a803248b6fd60ab
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Apr 4 15:20:09 2011 -0400

    fixing log message

commit e7776656e1d82d076e27827b6d4f56fde9de39d6
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 22:39:39 2011 +0400

    working with network_ref like with mapping

commit 57326f9e5b7e29c8413997e0bfa7b37deb8e7172
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 22:22:27 2011 +0400

    add test for NWFilterFirewall

commit 6b02ec144128bf30b79c2431502de9cd65ea667d
Merge: 302edba f4ee67a
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 302edba77f9491d2daf576bf74cc2ddc0fc46e02
Merge: 0e2b0ae 9a274b3
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 0e2b0ae922a478acebbc739ad3f26c373bfe67a6
Merge: 0e8c3fa f122f09
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 0e8c3faeb6e28e5c44a050028ef994f80a36b2e4
Merge: 9f2b2ef be40e5e
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 9f2b2ef96c3d518074587176f45612de2e4fd52b
Merge: de781be 64088f5
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 de781be21bf6b745241136a8d9391a6c72cfe875
Merge: b4b8919 c53ca9c
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 944e6f0008bac4c939392f982ca91d083e6380e1
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 21:05:38 2011 +0400

    Fixed network_info creating.

commit acb552ba26fc3c18565e2872047ca9b8e4e22339
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.

commit c53ca9caa93e81a8d29badf760ede6778d5929a7
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

commit afd7bf91e0cc518ef39252638b42ce1504806684
Merge: 20d1315 b4b8919
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 19:39:00 2011 +0400

    libvirt_con log fix

commit 64088f5d74ed531e282c56b6f5961b390ec40f38
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.

commit cf2d590752a0429ad249a8ef49b38d0dcd4d963c
Merge: c48184a b4b8919
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Apr 4 08:15:51 2011 -0700

    merge trunk

commit 5a7f761be0cae75dc5fba821db2ebce8f9284f67
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.

commit 20d13158b5d23c22d6c7732d7b41f75da5e7e973
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Apr 4 18:33:50 2011 +0400

    improving tests

commit 449065e0a8716751cf5964ec498d85fcae08800b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Mon Apr 4 18:31:35 2011 +0400

    network injection check fixed

commit b4b89190840bb0dc7b2eff01a2380faf8dbf5618
Merge: 3e80f27 5fcb7e5
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 3e80f27e7923989ae66f6121bd3c5aeefdaef6bd
Merge: e7c6671 e9c6350
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 e9c6350dccabe5571041dafd3a8b3a6db6c09f2d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Apr 4 11:16:50 2011 +0200

    Add bug reference.

commit 6109cea34418eced9165b787118943b71558d1cd
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Mon Apr 4 10:25:58 2011 +0900

    Use keyword arguments.

commit cc8e7711927b82d17d232d0fab9fa012323e48d1
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun Apr 3 22:50:38 2011 +0400

    add multi_nic_test

commit 8611a6667b3cfb3ff54ac160eea447efb53bd9b6
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Sun Apr 3 21:18:35 2011 +0400

    added preparing_xml test

commit 234a66b745951747994c1c7a4b28e0ed2f51db34
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

commit 08a2b71b937a10855ed9b48bb95d5e90810fdd0d
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 20:26:59 2011 +0000

    use novalib for vif_rules.py, fix OvsFlow class

commit 437ac53d092f2342bf6d23f30600b5f5a3266bab
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 19:54:55 2011 +0000

    extract execute methods to a library for reuse

commit 94fcfb09f2b1587122b37e7af3813116c714d939
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.

commit e7c66718419148778665a2376116e1ce12c281f6
Merge: 252ab6a 7128ffb
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 252ab6abca2d0d876b60e659f9015db9e257ea60
Merge: 9f91d6c 6734f6f
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 7128ffb398aadeee630582c70b61f27c69b1ec1b
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Sat Apr 2 01:44:12 2011 +0900

    Made the fix simpler.

commit f1be894b32254422b7269da0f35021e1677b6872
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.

commit 6734f6fde6cf03b10c0c7f956a2d85a9b1b38dfa
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.

commit 500991b08fee7b1862d4315cbb57d61b4ec416d4
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 15:28:21 2011 +0000

    change bridge

commit 83d24b00a1a78c8e25f5f1100256a56555483184
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Apr 1 17:10:06 2011 +0200

    Add euca2ools import

commit f565154d2bcd26b921a7febb07213c2331094f42
Merge: c559f90 9f91d6c
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 23:54:55 2011 +0900

    Rebased to trunk 930.

commit c559f90d24a9c224f282efcd8a45f480eb96168f
Merge: e275c1b edb0b14
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Apr 1 23:54:29 2011 +0900

    Rebased to trunk 726.

commit 535a4f4e948c2c47049e10ba540ec6fc1c600d84
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Apr 1 14:43:04 2011 +0000

    lots of updates to ovs scripts

commit 495d420151205983a226e608cb7f38a495d4821b
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

commit 5b71cfc89a8c9322f0e268b5e749ee187f91b502
Merge: 6771260 9f91d6c
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 31 23:21:27 2011 +0000

    merge trunk

commit 5fcb7e5fe465992eedbc1d31c1b932c717294f4e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 17:19:59 2011 -0400

    Hopefully absolved us of the suds issue?

commit 9f91d6c88a204b97edac5dad124e1ce4b5ded2bf
Merge: c683973 a09bda6
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 c683973be858d73526fbbf9e71205ed87fc6a69b
Merge: 1dc285d 26c985c
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 27f4f8d0205b26e98ae6cfc408162a308497961c
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.

commit 9a274b33fc1d93bcf4bf757b7d7d600b9a4776cc
Merge: bdc9e5d 1dc285d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 15:35:11 2011 -0500

    Merged trunk

commit bdc9e5d162166f1051925c8ea4cbe2ab33d4b491
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

commit 1dc285d739e8816a1ea3c18778b0d813bab253ea
Merge: cd3ee85 5d56310
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 26c985c84eab70606dbbe7c36f92bcffbe5e70a1
Merge: f18374e cd3ee85
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 31 15:45:36 2011 -0400

    merge lp:nova

commit 3d0ce2d7ec0f1d760b86473bd6be26cadf66ccda
Merge: b755cd7 bbc4ae6
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:44:36 2011 -0400

    Merged waldon.

commit bbc4ae62b796d91b81b6fe56dc2a9fad093f8f12
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:41:18 2011 -0400

    Adding explanation keyword to HTTPConflict

commit b755cd7f694335170f111ea31b02e0080e6311a5
Merge: c905d14 423fcb8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:40:59 2011 -0400

    Merged waldon.

commit 4387a97fd788bf26f5f0f6e541004f2be58c2a26
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

commit c905d142dc67b0a493f816cd98efed2128b5d0b8
Merge: 40d99d6 c431a7e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 15:38:00 2011 -0400

    Merged waldon.

commit 423fcb8b2aa5333b8096345116f35495ac271e39
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:37:44 2011 -0400

    Didn't run my code. Syntax error :(

commit 40d99d6db062d41d29cf164bd5393e49d7836129
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.

commit c431a7ebd24095b487680371d02501b5e886ef6a
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 15:34:33 2011 -0400

    adding servers view mapping for BUILDING power state

commit a09bda6800c5727f519475b35dca9c04da37b37a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 31 12:31:35 2011 -0700

    removes excessive logging on rabbitmq failure

commit 5d56310c9895c55ddf8fdef4a65c690fcf69fb31
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 14:29:16 2011 -0500

    Review feedback

commit cd3ee85c35407267b9102a5e175fc512f1fcaabd
Merge: edb0b14 8a794ef
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 aad28a0a44da0db349d0612739507ff7e0335474
Merge: 2e69c58 f9534df
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 14:43:15 2011 -0400

    Merged with Waldon.

commit 2e69c588a0b8e137384a767ef1359e4197bcad6b
Merge: adec1d4 d9a5982
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 f9534df5b2a489473c32e421d27833fda7d56b7b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 14:35:25 2011 -0400

    pep8

commit ae71e819701dbad6dd49ca67dc12373b75d7570c
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

commit 8a794ef870e1a09b636720fadb3e58a84f1bfbe7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 31 13:08:49 2011 -0500

    More friendly error message

commit be40e5e94f6923291ee2217ebd70a1ff87c720bf
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

commit edb0b1425c3d7a1caaf84c8bb5e9c2aab9877e6e
Merge: bc811cb fceb96f
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 adec1d41c3bed32e9109cc81e90f9f7ca754495e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 10:45:53 2011 -0400

    Update state between delete and spawn.

commit d9a5982dafbb54e21b0fb02114e72ca29f624d60
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 31 10:18:44 2011 -0400

    adding metadata support for v1.1

commit 33377a834f060347cafe8bc44b6226df846f60fb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 31 09:49:03 2011 -0400

    Rebuild improvements.

commit c9750f211f8ddcca71d66bfacb8c2f27e8fed688
Merge: c177e53 bc811cb
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 31 09:29:07 2011 -0400

    Merge w/ trunk.

commit c0b23f2979d27fb11fb3e32b0874f3d7a75a9904
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 31 09:20:47 2011 -0400

    Limit image metadata to the configured metadata quota for a project.

commit 570ac7a0e14b73d979921e8944765dcdc1b54c48
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.

commit e275c1b89460726baf8dfbab0840b55adb3a3423
Merge: 5512495 bc811cb
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 31 16:00:51 2011 +0900

    Rebased to trunk rev 925.

commit f4ee67a8b767eccd2375fe55815c3d8f8f57a26a
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

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 863c5b98e7f6d3e4a5884e242a44316f30e69ff0
Merge: 1c6a792 bc811cb
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 31 10:18:59 2011 +0900

    Merge trunk.

commit fceb96f22b497277cc77a9f1738bd2eca96da769
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

commit 72c26daa501ee76841a711e46482b3f72216a6bd
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

commit bc811cb6b57bad03133ecb34df90e080f0693814
Merge: a5fcc8b dbe0d38
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 a5fcc8b4d944e957609d1ca27a420a3e3a89d350
Merge: 799dbbb ac76090
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 777b74c8f0b8ebef6e883bcdada30331716d6a69
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 13:48:07 2011 -0700

    review cleanup

commit 799dbbb12b46312aa9355b9c1f5d072be8a66880
Merge: 138f488 a758f76
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 1ec4dd5f8b01b35c65e9a2265e9b01060e1c0e3f
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 30 13:38:10 2011 -0700

    localize NotImplementedError()

commit 6c1373f26b5119921649ef8be17f619e0ab015bf
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Wed Mar 30 13:36:03 2011 -0700

    Change '"%s" % e' to 'e'.

commit 18a6f2ee960cb341f5e609a317c47400155fff7e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 30 13:32:13 2011 -0700

    Fix for LP Bug #745152

commit b5e5b5cdcaa144406b266f5255cd676ac16efbcd
Merge: f6d5de6 ac07159
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 16:25:49 2011 -0400

    Merged waldon.

commit ac07159739fd9cd525c838a405040041f58984e9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 30 16:17:07 2011 -0400

    adding initial v1.1 rebuild action support

commit 2bd8c8a6cc6b599d5757792e848758bf6663fcdd
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

commit 9a96e67ee717aa3c375b2dbaa4cdc910fd4fdd69
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Mar 30 13:10:11 2011 -0700

    submitting a unit test for terminate_instance

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c177e53aedb12dc31954e3c023258e140fa43468
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 30 15:47:12 2011 -0400

    Update docstrings and spacing.

commit f122f09177be2df3c1d29514e9f8f7ffb8d3a81f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 30 12:46:22 2011 -0700

    fixed ordering and spacing

commit 89e6acb3a6b641628a55c8f777d621ccb8445ecd
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Mar 30 12:44:22 2011 -0700

    removed trailing whitespace

commit 9660119a9479a6676e5bf7c13c6a548f2e4d97c4
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Mar 30 12:37:56 2011 -0700

    updated per code review, replaced NotFound with exception.NotFound

commit f6d5de6b0cdd731b87ed63e42708ca7c2b9407b1
Merge: cc86d66 92cce15
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 15:34:46 2011 -0400

    Merged Waldon's API code.

commit 1cadb0eda9f5d20ac5b5b6cc393a6842994eab37
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

commit cc86d666473f4e4771ffb3188bc53cff7a5a1574
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 15:33:52 2011 -0400

    Rough implementation of rebuild_instance in compute manager.

commit 92cce15650305b27c4c889212bf1a3e567e478a0
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

commit 44f824a8b3f7b1868a0c7f22d52be0acf6eb0368
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

commit ac76090c14d347d4cb7c0a9cdf2c8e179bbfbf15
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 13:56:02 2011 -0500

    Whoops

commit 4b5de9aba6d82b46cdefc47590171f0b5f4803d0
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 13:50:02 2011 -0500

    Handle in vim.py

commit 3cd34b5e7c2cba72ad3dcc1780c8f4bd1f8d4d4c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 11:15:16 2011 -0700

    Refixed unit test to check XML ns

commit e20695e8d06b2787ec2226ec8b999d5a3bed3683
Merge: 3382604 138f488
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 138f48859e37d788f073bef459e9d142606cd535
Merge: cf249e5 0b4d897
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 3382604df75541425bf203e66411350ec7a98d09
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 10:49:09 2011 -0700

    More tests that were checking for no-namespace

commit b129ced691c00a05793311d1f6f01ce43e871c39
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 :-)

commit 9b3f9f996cfb9d55f53e032c8794f33d93a0bb18
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 30 13:34:45 2011 -0400

    pep8 fixes.

commit d530f9cf342128e1a167ce135a7980a8e7c5536c
Merge: c716099 cf249e5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 30 13:33:52 2011 -0400

    Merge w/ trunk.

commit c3e274a9d17a7766d829bee47193728b3d8ae2e8
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 30 12:28:09 2011 -0500

    Avoid hard dependencies

commit c716099a0d60aa26f862adb07ca6b7846243e8d5
Author: Dan Prince <dan.prince@rackspace.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.

commit 2f8a5abd70b7f1a6f5ab33105677ba022d5d84c8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 10:05:06 2011 -0700

    Add XML namespaces to the OpenStack API

commit cbb9810150c46f3aa6208bbd655283a08cb81bfe
Merge: 4a13d04 cf249e5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 09:17:46 2011 -0700

    Merged with trunk

commit 0dba9e30e55490ef8ebf7231250e83e75a7ef86e
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

commit d9863677dd35973bdcca20ed4c9a3f03a7fa7d18
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

commit 6b35766dfb05da072933a9093620e38275d32e49
Merge: 2533ec6 cf249e5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 30 08:57:37 2011 -0700

    Merged with trunk

commit 551249584ffe43c86367131ddfcd7f7d3cec7b70
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.

commit cf249e540cf881b9c84ff4e37233cdf5c0be870e
Merge: 68143c5 fa69589
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 a758f7656745df557eb780b8ecf04f366b85f46c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 30 08:29:17 2011 -0700

    queues properly reconnect if rabbitmq is restarted

commit 68143c5e777d17ced5960be7ff86adc6c3bb5ff7
Merge: b2d4256 6f89327
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 b2d4256bc30c973e3f923b771c3212d1fa32685b
Merge: e39cde7 60cbdb1
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 e39cde7f08369f2b06872f88c09e46919e212359
Merge: c2ab095 e089cfd
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 c2ab095f7d5ebc95ca05cd0468b3bc523dcb2ceb
Merge: 09dde15 dc6d263
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 0b4d8974039f165936449460d5e2e5db81ea3964
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 09:39:35 2011 -0400

    exception -> Fault

commit 467097f0003f309cd2c6d6d613c5d5ea1c0b9777
Merge: 56ed1d4 09dde15
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 30 09:38:09 2011 -0400

    Merged trunk.

commit fa69589e0282242a906057ff9bcda06d9baa0449
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

commit dbe0d386db004166cabb8a744a923b2b123abb19
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

commit 09dde15f41e0c5184cc73c16b6351e5bb33bcc7c
Merge: 6e84c65 b5e6104
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 7a8074c6b8c74e17851a861fea6ebcffc086141d
Merge: 0730865 6e84c65
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 30 10:41:25 2011 +0100

    merge trunk

commit 6e84c6522eb1898a7e23554b66771be4e84c10e7
Merge: 6ea8cfd 42907b4
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 f78a0034d124ad39daf77e208a7c29f3837bf1e4
Merge: d197a7d 6ea8cfd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 23:12:39 2011 -0700

    merged trunk

commit 6ea8cfd1ef8f058b2ead34a32cec9e5a27a72110
Merge: d6865a1 3b9fb7b
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 d197a7d158bbdf7b6cedb97f645a33129216d33b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:55:16 2011 -0700

    make sure that flag is there in compute api

commit 3b9fb7b92d77838afc69a0782d86eda01120d460
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:41:15 2011 -0700

    fix localization for multiple replacement strings

commit 06c3dac4c1a45e9126da41384f3509683cc6584d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 22:37:19 2011 -0700

    fix doc to refer to nova-vncproxy

commit d6865a13446d895fc6b50915795d3a84976d9af8
Merge: 299eaad c9affaf
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 c9affaf9d0db0270719d963736192e4e566c1a7f
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

commit 5e1f3af793814afbf749c705f685250464ed6089
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...

commit c3879272c7ffeb6e8ed59c2644a9317096372742
Merge: 3401d7d 299eaad
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 19:09:42 2011 -0700

    Merged with trunk

commit 3401d7d0bc901ff0a1899eea729294c7e3e8baa3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:16:09 2011 -0700

    "Incubator" is no more.  Long live "contrib"

commit 96374ad32f001ec4b3df95ddf24dfd5fc0f944f9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:13:04 2011 -0700

    Rename MockImageService -> FakeImageService

commit 432963f726d03c3d2f319305287317985c540ba3
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

commit 410bfe493f647297f8e5d1b3240f3b65ee526c6c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 18:08:17 2011 -0700

    Renamed incubator => contrib

commit 08ccec2f898d5c492b376a64e57a01bcf9b48695
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

commit dc6d263e78c22caa8514b7146c4554ec269c8e2c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 29 17:23:09 2011 -0700

    use project key for decrypting images

commit 77deef0ee9a51ffb2339b8e9a72b159e39751352
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:22:20 2011 -0700

    Fix a docstring

commit ed4df2bf48c6e286407bed40febe4a1ac61e7680
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

commit 3d2c72f901ea0b2f324da03eaab3f986b6cccbee
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

commit c2bcc889faf586e1f9d7e8d2eab050a64cbeb8f7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 17:10:40 2011 -0700

    Removed commented-out EC2 code from volumes.py

commit c47ca4cc9d64108f267ce205e1922f1c1498afd3
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Mar 29 17:07:59 2011 -0700

    adding unit tests for describe_images

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6244777453d508c7af565df2140751f7153a61d8
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

commit edfd2539c8282e4bc940dceb9f693e17d402b1f9
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

commit b5e61040ecca881d10c2a5390d4140ca794d41b5
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 16:13:09 2011 -0700

    fix for lp742650

commit 1227c361ecaf1bb23211b1c418ca305f69b70223
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

commit 0b6ed749c1437c92d2dc9ba077e1ba80afb846c4
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 15:43:38 2011 -0700

    pep8 fixes

commit a902ad6524e0b57d16c3cb938b0deefc16f29112
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 29 15:37:45 2011 -0700

    Reverted extension loading tweaks

commit e089cfd169b19531738e2444f36966d6d2ce6c1d
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

commit f8e2db109511bee849b3dadf3967bc3171aeb047
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 files changed, 1 insertions(+), 0 deletions(-)

commit 2d196c96ab9a678de37faab2797ab48189c836bc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 15:22:16 2011 -0700

    clarify test

commit 4b7c6d760d5be38b566b044d0efedb3b3bc42bf7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 14:58:10 2011 -0700

    add line

commit f16d98d502814a8d9fe82494b41d775ff3b53a40
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 14:53:38 2011 -0700

    incorporate feedback from termie

commit 299eaadfa464209edff4b8b9d87a5af86bf8190e
Merge: f193b24 c11ff19
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 29 21:46:56 2011 +0000

    Make dnsmasq_interface configurable.

commit f193b244720b0e22d8b456c37d4eb98acf416dd8
Merge: 763e88a 23ce77d
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 0621a194455a02eb7a0a758d1cce267dcc414c5d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:59:46 2011 -0700

    add comment

commit 1aba22e4ee9e666c70fa13d790875b494c693fa8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:55:01 2011 -0700

    switch cast to a call

commit 4cb414d1e78440fe6f49e1ae680de5b1ccfcb47a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:49:49 2011 -0700

    move functions around

commit 3861dbfa40adbffde6ab5681535d589b543a4eb3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:47:47 2011 -0700

    move flags per termie's feedback

commit 0112f7351dd13a6f9a181f85697ebcac7d0ba790
Author: John Tran <jtran@attinteractive.com>
Date:   Tue Mar 29 13:44:38 2011 -0700

    initial unit test for describe images

commit 23ce77d60a1c5508935994e279a1bfe9cba2b747
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)

commit 8b382fd1761c07e04b7a77f27ae01f87ac541208
Author: John Tran <jtran@attinteractive.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)

commit c11ff190ecaed7e9f4896f1fa904b00c3c3e1aef
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 29 15:32:44 2011 -0500

    Make Dnsmasq_interface configurable

commit d81593455429dec077761911c064951c9feaf808
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 13:32:03 2011 -0700

    fix flag names

commit 763e88ae0f99f2070aed0112b173c9bc576e1999
Merge: 961fe58 08eca6f
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 961fe580990ab937bb520451e06e8f610505cfd8
Merge: d8e1d52 5842122
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 871d320595e0ab41ed840f329e81294e177077e9
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 29 12:54:35 2011 -0700

    use manager pattern for auth token proxy

commit 58421227f2ef6fb66a2a68733beca8f31eb309fb
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 15:48:02 2011 -0400

    Style fixes

commit 08eca6f7db3bb6ff7461acc6ac6b44057556b274
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Mar 29 23:30:06 2011 +0400

    style fix

commit d8e1d52b0f588204cf728396fc8f07564b4895f0
Merge: b0ce84c d1f3be9
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 2d1c341b77c934e6d2fd5c116449d15b5099418e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 14:56:46 2011 -0400

    Fix up docstring

commit 56ed1d4fd56b4bf24e478671449ae484ce65dc2e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 14:56:18 2011 -0400

    Added content_type to OSAPI faults.

commit 0eb09d8c02aeb292140715e56bc4944ae1fff4a3
Author: termie <code@term.ie>
Date:   Tue Mar 29 11:15:16 2011 -0700

    accidentally dropped a sentence

 HACKING |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit bab65a48c10b7e17d152cb3e58ea4fb74f3c2363
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

commit b0ce84cf33c1f8e8eb663ce771751aa758242c65
Merge: 9340060 63a0f08
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 63a0f081ce3e8301ca93a444f3851050400e6abf
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 12:12:26 2011 -0400

    Import order.

commit d1f3be9dde21c94e326144384774fd0087387866
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 12:06:52 2011 -0400

    Switch string concat style.

commit 60cbdb130fe81a4763820e5020b96b0f8b28b777
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 12:04:43 2011 -0400

    adding xml test case

commit 8782020921081bdf67f0a32c36d0ec69c75c71d4
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

commit 6ff7ad8ea3a8c20e1d8f8f545dd504aa39a55a12
Merge: eb15088 9340060
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 11:26:41 2011 -0400

    Merged trunk.

commit 934006012eb3ed522deeeaf7cc61150fe6ade1cd
Merge: 4f6cf92 0c6a3d8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 29 15:23:15 2011 +0000

    Added VLAN networking support for XenAPI

commit 6f89327c2edea5a1a2dfcfbf2dfffab8f37d0206
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 11:16:42 2011 -0400

    pep8

commit 306b8e1e15b4d9cd3507f15a2fb1eb9c2324f1a7
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

commit f18374e60a1fb87e3a03973dd434216796f15919
Merge: ade3741 4f6cf92
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 29 10:54:46 2011 -0400

    merge lp:nova

commit ade374126e1ad3ea059598209dcb4b66e38938e1
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 29 10:53:44 2011 -0400

    use informative error messages

commit 31007161d5060f1fbb4926acddaba76142818943
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 29 10:40:35 2011 -0400

    adding more tests; making name checks more robust

commit 677126002539c44ab1c5d2645c8cd040a1dc52b2
Merge: 7892452 4f6cf92
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 29 14:22:46 2011 +0000

    merge trunk

commit 0d102aab423273732ee3deaa042a15f5c8635e15
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 10:01:54 2011 -0400

    Fix pep8 error

commit eb150884fad9acf0030a83f5f99a0be18bd3f94b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 29 09:51:02 2011 -0400

    Tweaking docstrings just in case.

commit 2266c36e21a85053bb0da080ff0a4796be098926
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

commit 4265e710441db9b46df491dcad5ea25ef84f5a90
Merge: 8583e69 4f6cf92
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 29 06:51:30 2011 -0400

    Merge trunk

commit 0c6a3d8e03854a5ebd881c924c71d746d2cd9b59
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

commit 0e927d7629907d1c73e243355e426ab208ef1c19
Merge: f286a04 4f6cf92
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 29 11:10:28 2011 +0100

    merge trunk

commit c48184a136f747808ff6da9b5a504c7f12ad7d77
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 28 23:11:42 2011 -0700

    make all openstack status uppercase

commit 1c6a79226a2086ad94162a76529b3cb77f963732
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Tue Mar 29 10:40:48 2011 +0900

    Add remove_volume to compute API.

commit 8583e6972bea5c2b52488028e8d3eb2eff225eef
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

commit 36399ed7e66b14e1756fecda40f159ff9c5e2faa
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Mar 28 18:19:56 2011 -0700

    cleaned up var name

commit 8ba57237ef148b9f810eae41c0fcc56e1710bc3e
Author: John Tran <jtran@attinteractive.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.

commit 4f6cf92934a045e58afd406d4faff8c91d8d5a64
Merge: ae90f15 687c149
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 d41c3f2ee583e414e3b799ca41f2a222600e54d7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:11:16 2011 -0700

    Yet more docstring fixes

commit ad6e2b33daa826c74c126ae19de1b36f9c52bfe3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:09:39 2011 -0700

    More style changes

commit 89df51d569fb48b171ab1a6a60f77e64ce62d829
Merge: 27f8be3 ae90f15
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Tue Mar 29 09:04:33 2011 +0900

    Merge trunk.

commit 2d1e1b54b8277ea12011f9d8834e68529d624b6f
Merge: fc0e974 ae90f15
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 17:04:14 2011 -0700

    Merged with trunk

commit fc0e9746e8d3cf56d1e4ae12ddf15b8f726736cd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:54:17 2011 -0700

    Multi-line comments should end in a blankline

commit 42907b466b1c2c1f7ef9702666f5c412083439c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 28 16:50:33 2011 -0700

    add note per review

commit a60548b672b100d8ce8e49c42bbeab0c4e4d0053
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:42:28 2011 -0700

    More fixes to keep the stylebot happy

commit 7a925e9fbcda09ac7a834abb45a71b3f69c075e0
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

commit 39fcb27d8b9dbcbf289bd9fe9f3551a627c05d57
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 16:30:31 2011 -0700

    Code cleanup to keep the termie-bot happy

commit 687c149a9c63866209c84644cbe47c31c57859d1
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

commit a6bcd2224d06a507be77d6e55c0dc4ae1fc67ef0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 28 15:46:01 2011 -0700

    Fixes volume smoketests to work with ami-tty

commit 09205ad59ddfba7bf49ae2c22fc2e43b3ceafae8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 28 15:38:09 2011 -0700

    address some of termie's recommendations

commit 8ee2ec6ff735d05e71bfe6cdec774699ea054ee9
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Mar 28 15:30:25 2011 -0700

    add period, test github

commit 3f5854da2f7113e430391ae4cfd3e62ed762d02b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 17:45:48 2011 -0400

    pep8

commit 19512a00caeca05dc83b7a1a680a10b635e26219
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

commit ae90f1563479dc12ace3c86899e79ad058320509
Merge: b0081f3 172413e
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 f286a04b916889e445bbd8f3cb2375007cb9fb3f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:25:11 2011 +0100

    fix docstrings

commit ad487fa8ab48031b385ed32af4e5f689b88e383b
Merge: eb3cfc5 b0081f3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:23:14 2011 -0400

    Merged trunk.

commit eb3cfc5a71a04fb4a849e6f84620c10ace040878
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:15:54 2011 -0400

    Updated docstrings to satisfy.

commit ebcdce9a6e85a2c73040591e1cb1ace9b98651f7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 17:13:37 2011 -0400

    Updated docstrings to satisfy.

commit 6fe12a14143469cb0c913e8815a8eeb194d3a682
Merge: 57b04dd b0081f3
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:04:52 2011 +0100

    merge trunk

commit 789245223dc743f579b49f3ce56417ee635f5887
Merge: d1c0e23 b0081f3
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 28 21:01:05 2011 +0000

    merge trunk

commit d1c0e238148530c5e836a1d0ae876066cf646ce7
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 28 21:00:44 2011 +0000

    minor fix and comment

commit 57b04dd70b6cbe50c810c1ef29780c782f8a9fec
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 22:00:17 2011 +0100

    style fixes

commit 172413ec0b370eca1fd122a0acd346c1c1550a21
Merge: 87523bf b0081f3
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 28 16:57:35 2011 -0400

    merging trunk

commit 97a4305b168e7d484f158c3cfcdef4d71ec3ceac
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 16:42:09 2011 -0400

    Made param descriptions sphinx compatible.

commit b0081f3f56aeaaf48c87ae55974b35b53e2ec82c
Merge: b06056b 9074abb
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 9074abbd6c835f1c45820c8cc979ab1e6f7a831a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 22:21:18 2011 +0200

    pep8

commit 10f3aa29c8e9917251de83143ce806bb3a8cb1e6
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 15:57:18 2011 -0400

    Fix up libvirt.xml.template

commit b06056b1d56f80862bf423221c2d7ac7b3330d21
Merge: 8809da2 fd605fa
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 df4b61813f1e0c6ec91c879a3ba7c23010c9effd
Merge: a2c107a 7d6cedf
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Mar 28 12:24:36 2011 -0700

    merged from trunk

commit 8809da25b5f337db8ef058db1e1094c6e10a253a
Merge: 7d6cedf d831b70
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 88b353ddde61825c85b96bf58ed983e8b3411790
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 15:10:34 2011 -0400

    Fixed superfluous parentheses around locals().

commit fd605fa3d9b4a19ea58061d3b50d236aa3b58272
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

commit 9106aec84d52c66aba944be30109357febfedd14
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:47:25 2011 -0400

    use self.flags in virt test

commit 7d6cedffbb95094c6040f6e161dab2c3bd36df90
Merge: ed1c777 5e7518f
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 292f07c1ceeb84f1473e4663040609ecddfcd89b
Merge: ab1102c dac5417
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 28 13:43:17 2011 -0500

    Merge from trunk and resolving conflicts

commit dc66f1fad418df2fa03409ca255d5712fdd02698
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 20:36:07 2011 +0200

    Remove now useless try/except block.

commit f13be29d9d4923255bbdf9ca7982c371cda75212
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:32:03 2011 -0400

    Dont make the test fail

commit d831b70b777264a7a5a01b887e1e3089b0dc8857
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

commit a2c107a5fba0ad5ef838a7b80683da9cc8f2d0e2
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Mar 28 11:29:23 2011 -0700

    when image_id provided cannot be found, returns more informative error message.

commit ed1c777932867cf8fa823c8c9036923d2dc7855e
Merge: 4aa4d67 72e343f
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 1f788dbe40d0fb60f935e544867ed5de00d64121
Merge: 83c81ed 4aa4d67
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 14:11:15 2011 -0400

    merge lp:nova

commit f8d398c82241fdb8362d1e22a4b0af68f0c458a9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 14:07:33 2011 -0400

    More pep8 corrections

commit 87523bf1c2dc68edae240c124b7e745c3b20a975
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

commit 7fac72dc185252c3fa880faffed2a1d37956f6ca
Merge: f39f4e6 4aa4d67
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:50:27 2011 -0400

    Merged trunk.

commit 83c81ed73b75d1bfe353a3f6bb51deade56fcb56
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:50:24 2011 -0400

    pep8 whitespace

commit fcb10587739aaa482c6970d8d99c6a3053bec999
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:49:51 2011 -0400

    Add more unit tests for lxc

commit f39f4e6006c360b30e5829d7b6ff011000f879a2
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?

commit 72e343fd2503ec904e9b7875729d3016549f2942
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:47:11 2011 -0700

    update glance params per review

commit f2852856c8060c75ac252e5d9c881fb2f13dabe4
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:47:08 2011 -0700

    add snapshot support for libvirt

commit 6b60e8571617acac3cc61d52eb797e865d621097
Author: termie <code@term.ie>
Date:   Mon Mar 28 10:46:02 2011 -0700

    HACKING update for docstrings

 HACKING |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

commit 0730865625636672ac3810c2fd86fd4929f972fb
Merge: d59d303 dac5417
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 18:45:59 2011 +0100

    merge trunk

commit 57dc99bff78c0bb79aa9f5f48406b618a1fe0d3a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:44:33 2011 -0400

    Fix libvirt merge mistake

commit 35f3844a7ed1580206b25ce1f243c81c739b9122
Merge: 5f5043a 4aa4d67
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 13:41:07 2011 -0400

    Merge trunk

commit cd78cada2b52c1d26aa5ec15b896170f62c4ef7e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:40:16 2011 -0400

    lock down requirements for change password

commit acb412ea5712e7d29c9a62cb60a8d02f05a76d6b
Merge: 05c948f dac5417
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 18:38:13 2011 +0100

    merge trunk

commit 4aa4d675a62c1d60a7b14d1d96cf101836087630
Merge: dac5417 d4ef258
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 5a01102c8dfb149a0c04ed41bfeacff2ab844bfc
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 13:30:15 2011 -0400

    style changes

commit 5fbdaed624c7810d058e73b8a60a8a063f47092c
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 files changed, 0 insertions(+), 1 deletions(-)

commit 81a66e91abf57ed81cd92f2234c59214f069ba03
Merge: f9826ac dac5417
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 13:19:16 2011 -0400

    Merged trunk.

commit f9826ac7dad4f3eeabb50055457550ee7869c189
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()

commit dac54178e20b7ec7b7be1090a242ad4d8f55208b
Merge: 4ed68d6 6ccb019
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 8f3272a4dddc9fb3c98c03001260b5542565867d
Merge: cfe332e ac4922d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 28 12:13:20 2011 -0500

    merge with trunk

commit 21eb2f77270c77b9bb816cce71ee8a6a328adbd2
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.

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6ccb019057a43450d96b7029210f59f974bfa5ca
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 #

commit 6e5607674fc2f2b9ff6cad79e90f82715a93f8f8
Merge: 59f8e28 e53cd95
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 28 12:58:21 2011 -0400

    merge lp:nova

commit 4ed68d694e157923058e0170cc135d4875a6aed3
Merge: 8cc3131 467a46d
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 8cc313157b49d2a892d56564d0fdb8c0321e641b
Merge: e53cd95 5018329
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 2533ec600f3724eaa6d2b5a1bcfc64dceea71c33
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

commit 7e637f48eaf8d1247adcfa64b1fd55a3dbd64ec0
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.

commit 467a46d9343e0ccdd9fa17489e65ef80efbecf75
Merge: 7632d6f e53cd95
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 08:05:28 2011 -0700

    Merged with trunk

commit 05c948ffebe216318f7789f085a1f065f8873b99
Merge: 04dc0a8 e53cd95
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 16:02:54 2011 +0100

    merge trunk

commit d59d30366b1655509ec6297bbd643ee16a9a5dfa
Merge: b54283e e53cd95
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 15:58:06 2011 +0100

    merge trunk, fixed conflicts

commit d4ef258a6d23109c54ec4a08e1a7a031f9831ba8
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Mon Mar 28 10:31:51 2011 -0400

    TopicConsumer -> TopicAdapterConsumer

commit 5f5043a5bdc2baf9647bfae1101bfb0ab9e3ec44
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 28 09:37:05 2011 -0400

    Fix typo in libvirt xml template

commit 2a75ee1c2ac513b153aa1ae3e1235811fba4134d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 15:34:20 2011 +0200

    Spell "warn" correctly.

commit 5cc4c90548a627b777b5d95754c4b8f1ebfc7f2e
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Mar 28 07:33:57 2011 -0600

    Updated Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 06d071c07e7995c4a631de2f909fb11c4430ee3f
Author: Kevin Bringard <kbringard@attinteractive.com>
Date:   Mon Mar 28 07:31:37 2011 -0600

    Removed extraneous white space

commit 6bd9185724962ce411f601386fd147e84f2804f3
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.

commit b54283e7a0e2cff9c8c9aa4eeec9d81f71977374
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 28 13:11:45 2011 +0100

    addressed reviewers' concerns

commit 04dc0a854fed9fdd15879c0a67520ed988bbd5d2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 12:08:43 2011 +0100

    addressed termies review (third round)

commit 0c5ae320507ca552a042cdb89b1c928340688e6f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 11:52:28 2011 +0100

    addressed termie's review (second round)

commit 9bea7464c7cd2de25ff5f4ab89da5f7606ecbf19
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 28 12:24:41 2011 +0200

    Do not load extensions that start with a "_"

commit 219c08b4543004c3db3570906c3fd903eaccafe4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Mar 28 10:54:29 2011 +0100

    addressed termies review (first round)

commit 2618efb1fae1fe0dec4a29546dbc92b4de323602
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

commit 7dbc8fcb8a2a67c19a645b7cefc2fc282f639e6b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 01:05:20 2011 -0700

    Fixed some format strings

commit 0f04a9585b3c1425f46349a043753da5b1654548
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:44:13 2011 -0700

    pep8 fixes

commit 2460f855830d7e7b99febb56f2eddcecd30be8a1
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

commit 50183290381bab5aa13e6215b6e96050fbeaf57b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 28 00:32:48 2011 -0700

    pep8 fixes

commit 17ff82ba693c1b165c4945afa4b018cc56a4a1e3
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

commit 46f71753ede4ada064c7a1fe302ebac7cbf1cde6
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.

commit 27f8be32b93445ed2ae6f6cc7a89ce298cb54107
Merge: c4fa2cd e53cd95
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Mon Mar 28 14:11:14 2011 +0900

    Merge trunk.

commit 6e50245e2688e571380db67ee80a322c2474ca07
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 27 19:38:20 2011 -0700

    pep8 fixes

commit 082aab31b829bf816749db3c7358b6206a328bfa
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Mar 27 18:48:32 2011 -0700

    Bunch of style fixes

commit bb73d14c1622c0cc2dac9a2d449e1642249c2c13
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 27 15:30:47 2011 -0400

    Fix utils checking

commit b9474080f0a9b3fe5c33d45427ec8da73427d25b
Merge: 8bdf936 e53cd95
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 27 15:30:22 2011 -0400

    Merge trunk

commit e53cd950616e1030e2ade86c8c810f45ad72a1dd
Merge: 3ec44c9 a77ee6e
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 718b15a43d5ae7ba65c42f781de9d8818e639a09
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.

commit 3ec44c95bc58622ad0011238218e5b9c99295eea
Merge: ac4922d 5c9f535
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 6e407b62d89dd706e3bcbb0815c4224646a73aa4
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

commit 30f21e8fa871a62e23ba69ade977f39f3723cfee
Merge: e9010cb d8da45d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 23:43:21 2011 +0000

    merge trunk
    addressing Trey's comments

commit fea03718a7c7b49cc60b61499a66ce88fce33c0a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 25 16:39:43 2011 -0700

    Initial extensification of volumes

commit 18f324731b44b2f99eaa48f69ede3ecb8b110351
Merge: 4ee1108 ac4922d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 25 14:59:01 2011 -0700

    Merged with trunk, resolved conflicts & code-flicts

commit 8fd78584c40bf18faf55666d6afd4e40df850e24
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 16:57:21 2011 -0400

    Removed print.

commit 0a34705a6edb33a38903e643abadf408bc939867
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Mar 25 13:17:51 2011 -0700

    added a simple test for describe_images with mock for detail funciton

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 8bdf9362416ff616a0146d6921e8b07eaa01f338
Merge: c05d1d8 ac4922d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 16:06:38 2011 -0400

    merged trunk

commit 8e4c4638dcea8fd9ead2f947d119dbc21ecd03ae
Merge: ab90c88 ac4922d
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 25 19:46:52 2011 +0000

    merge trunk

commit 59f8e28faa33d0ca4c136cce5aabf2305a615e58
Merge: 667c42a a02009d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 25 14:53:30 2011 -0400

    merge lp:nova

commit ac4922df5bf179e63fa42382c5515066cbaff9c7
Merge: a02009d d989feb
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 302c8fc6676f70e6a43172a9fd07d770a6aa858c
Merge: 24f1dd7 a02009d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 14:09:55 2011 -0400

    Merged trunk.

commit 5029aaa77317b0ead045e23096bc6970e3c80ca6
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

commit 6d76ca3aabd4a8128c674c10b3aafa40ac4190a4
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

commit 5c9f535cbcd6d2253a713df13f1b10077c185495
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 25 09:40:59 2011 -0700

    fix typos

commit acbe8b743f50df03d7098560bf7820fd0e4f6faf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 25 09:23:10 2011 -0700

    updated nova.sh

commit 5bfa825fd385b21068a9cc73d92b6b512ede8210
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

commit a02009d92254496c19c22ec17aa0d2c58c207425
Merge: 416a63c 1fd5cb9
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 24f1dd7bbf18847b87b5177d4547ac0fb3210b9b
Merge: 54901b5 416a63c
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:43:44 2011 -0400

    Merged trunk.

commit 54901b53a1856fcc212fbe4199d32aa0d71c0e5a
Merge: a802bdc f0a15b0
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:12:28 2011 -0400

    Merged trunk.

commit d989feb3c3152dd5df23b8ab43884b24b7d65a73
Merge: eb838e5 416a63c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 11:11:03 2011 -0400

    merging trunk

commit ab90c88b7fc0e6e5551a0e8bf84720876115357d
Merge: 48f4b86 67d0338
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 25 15:10:56 2011 +0000

    merge trunk

commit a802bdc31a7fd63b9fa38491762ab50fb18813d3
Merge: 794dbfb 3a541f7
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 25 11:10:54 2011 -0400

    Merged trunk and fixed broken/conflicted tests.

commit 416a63c2e24498c6f9322a4b53804dcccbdb09a1
Merge: f0a15b0 3df5494
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 eb838e50d10c90ba19ea00f55d8a00d5f3f43795
Merge: 89d160d f0a15b0
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 11:01:51 2011 -0400

    merging trunk

commit f0a15b0834fb19fc3570cf1a87095575bede9398
Merge: 70477c6 d8da45d
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 89d160d2c35fedc0ea81505607e3f6a26db58fa7
Merge: 70d2030 70477c6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:56:53 2011 -0400

    merging trunk

commit 70477c64716fd98b8f32a8fe1eafb46a199e9bbc
Merge: 67d0338 8c9029a
Author: Dan Prince <dan.prince@rackspace.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 70d20305fb0d2c226cf4118612714a04482cf4e5
Merge: ccb89ea 67d0338
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:55:07 2011 -0400

    merging trunk

commit a77ee6ede0da1982b1cf4cb78c68622082da5d42
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Mar 25 17:46:28 2011 +0300

    Changed use_ipv6 passing to interfaces.template

commit 3df5494160f9e562238b7e979a156644929f7fef
Merge: 796131d 67d0338
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 10:36:37 2011 -0400

    merging trunk, resolving conflicts

commit 67d0338b7b458bab243411fb587c14910ef2e329
Merge: 82794e9 101d5b7
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 a9cae0eff40e9f65f9eccb9e2f65900399e3aa14
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.

commit 8c9029a03ec05fe352025d371ee1c65a983bdaa1
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 25 10:07:42 2011 -0400

    Use metadata = image.get('properties', {}).

commit e9010cb62d201c134e886d57b5a6d097375c5012
Merge: 820b8ce 82794e9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 13:41:11 2011 +0000

    merge trunk

commit c05d1d8063781509590a4c7596d2a5fb032756d9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 09:39:20 2011 -0400

    Revert dom check

commit d8da45d9ce9e4c920bd1c06813c4bcf0772f5db7
Merge: cfb7af4 82794e9
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 13:38:57 2011 +0000

    merge trunk

commit 7a2248c8d27ff2a08e17aab0ad1b3e9ccf251ab0
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 25 09:28:36 2011 -0400

    Fix unit tests w/ latest trunk merge.

commit 796131df6fe61f94df0897fb7d70406569960708
Merge: 0daf56a 82794e9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Fri Mar 25 09:11:13 2011 -0400

    merging trunk and resolving conflicts

commit 3a89f97acfaa44c48b34272dccc034b47c65d389
Merge: 1099986 82794e9
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 25 09:00:47 2011 -0400

    Merge in server metadata from trunk.

commit 1099986ba3b61c872c2d5148bd2edb84da5969ca
Merge: 1875413 3a541f7
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 25 08:57:42 2011 -0400

    Merge w/ trunk.

commit 20719370aa49fd8a5485f2dda49bf81bb32eda98
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:52:54 2011 -0400

    Fix up destroy container

commit bcb5065bea19715ccc3ef1c5354b020f80c80768
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:52:18 2011 -0400

    Fix up templating

commit 82794e982ee01360aa5677169fdbd586fcb5b3b1
Merge: 3a541f7 46a1ec3
Author: Dan Prince <dan.prince@rackspace.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 3cad8bc605191fb22c43728688f79ce800d78fbe
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:37:47 2011 -0400

    Dont always assume qemu

commit d30c26dd960e06a8d15b51e0bd9ab5285cea6c9d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:20:56 2011 -0400

    Removed partition from setup_container

commit 4de312cc97c4e9afcc2ebb753a2d3e80d51454ac
Merge: 63c9220 3a541f7
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 25 08:17:57 2011 -0400

    Merge trunk

commit 1fd5cb9ff7d3ff14ef2934d2b7f3b42d12b09fe5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 23:49:14 2011 -0500

    pep8 fix

commit 316108b0639ad778ae15e393caa8389576dc457d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Mar 25 04:41:47 2011 +0000

    disk_format is now an ImageService property

commit c4fa2cd63a1739fccfbd63d7b1fc84842073e912
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Fri Mar 25 11:47:17 2011 +0900

    Restore volume state on migration failure.

commit 8db7b13295bf040b1082dd3b8fbf424697e5c86e
Merge: f007357 3b2447f
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 f00735796d79d246cd5956716da9ee7f6cefe99a
Merge: cd2dbe3 3a541f7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 19:17:17 2011 -0700

    merge trunk, add unit test

commit 820b8cef2347afc07ac18b9d8b3c746638d6a951
Merge: 6630a64 3a541f7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 02:04:13 2011 +0000

    merge trunk

commit 130a68af635da841121f401445c21771dd1c79b8
Merge: 00632cb 3a541f7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:52:18 2011 +0000

    merge trunk
    addressing reviewer's comments

commit cd2dbe3990c9ddfa5b83ffb21a6152905bd69c6a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 18:38:28 2011 -0700

    clarify comment

commit 28a213e70d7faa79704b99b80c350830eed5bcfe
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 18:37:23 2011 -0700

    add documentation

commit 00632cba105b9c41d929ebc3fe47545bb545b59c
Merge: ed925d4 95c3177
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:34:14 2011 +0000

    Empty commit?

commit cfb7af47ebdae818bdf4a1b6691115c97799603a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 01:23:33 2011 +0000

    minor pep8 fix in db/fakes.py

commit 3a541f73da6723ba8b84ad65882aa540d87150e6
Merge: 63ecd91 ee9351f
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 85a4f27d63851841f2adc80143d06008811cbb3b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 17:44:27 2011 -0700

    add hook for osapi

commit 31de78eb4387727372374b2c3bf3fe1e63239c1b
Merge: 453b7b4 63ecd91
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 25 00:25:06 2011 +0000

    merge trunk

commit 63ecd915346797c4eb10d2c4922914f17f1fd8f4
Merge: 2db5dd5 6cd17bb
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 453b7b4bfcb29e571126fd609737a035d4c4f939
Merge: fcebf33 5354f00
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 ee9351f43021a648db05607438d49a77fa0e6bad
Merge: 72f41d6 2db5dd5
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 20:06:23 2011 -0400

    Merge from trunk

commit 2db5dd5cd02a92625ea6fcc1839da4fdf66f9b16
Merge: fc6b16c c448528
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 acf05c40d6371894fce3766647ae407b2ccb6f8b
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 17:04:55 2011 -0700

    make everything work with trunk again

commit fc6b16c02d137cf096e3e031df20ec75c121fbd8
Merge: 95caf63 72f41d6
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 6cd17bbef41856e6990c7acfe95b3c7814595cd9
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:31 2011 -0700

    add descriptive docstring

commit 93f0fc4e732b4053255c04e6f7981c97e9adb127
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:31 2011 -0700

    don't require integrated tests to recycle connections

commit fb29acc49e6adc429c2847340505f181eea53324
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:30 2011 -0700

    remove twisted objectstore

commit f874eaa26e0c979c8a49f4bee7494c6a7b018c09
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:30 2011 -0700

    port the objectstore tests to the new tests

commit 1c172d4ad2d082ca778072eeea21cc79d19aa425
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:38:28 2011 -0700

    update test base class to monkey patch wsgi

commit ad3cab5fcccbf3a6ec012984bc1081d16f892feb
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:35 2011 -0700

    rename objectstore tests

commit 91b3093754e77aad48365029a02985ac2de3adb6
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:35 2011 -0700

    port s3server to eventlet/wsgi

commit f194094ccfd73e03cc4edf667989b33455d000f9
Author: termie <code@term.ie>
Date:   Thu Mar 24 16:37:34 2011 -0700

    add s3server, pre-modifications

commit 72f41d695b38ee34a069b72308f26880f1f97510
Merge: 0b1658e 95caf63
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 19:34:52 2011 -0400

    Merge from trunk

commit 564ff0e2a484c8f1c9afefc3101d5a3cc31cf593
Merge: 3ce9061 95caf63
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 16:03:25 2011 -0700

    merge trunk

commit 794dbfb13b6c1ac6f5ad4a000458a38ed004bd32
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 18:59:11 2011 -0400

    Added detail keywork and i18n as per suggestions.

commit 3ce9061954dc4040a99e685b400b0fe1597eb3d1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 15:55:29 2011 -0700

    incorporate feedback from termie

 tools/euca-get-vnc-console |  163 --------------------------------------------
 1 files changed, 0 insertions(+), 163 deletions(-)

commit 46a1ec33f9e36bc060b5f5e24f18c3cd0e5f0441
Merge: 5c56975 95caf63
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 18:47:36 2011 -0400

    Merge w/ trunk resolving conflicts.

commit 95caf639914c4219e1589656ab5c17d0a687d85a
Merge: 5354f00 2ff6241
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 066780553c1e12ce7ad2b9f49f949c317ab08c70
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 15:41:02 2011 -0700

    fix typo

commit fcebf33f609eb752b3fc3871b9fc1639f86618d1
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.

commit 5354f00a33f5234cfb9a05520e020545c0d7333c
Merge: b3c91ea 63e73ac
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 0b1658ec892f8ea5fcef21f2ee6a656caa878d23
Merge: b9180e7 6650545
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 18:32:00 2011 -0400

    Merge from trunk

commit b3c91ea545ae3bb2e523018fba2672556c78abee
Merge: 6650545 58fbede
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 66505453137f7657d81ede040bb454f880a64dde
Merge: 23a4164 b530bf8
Author: Dan Prince <dan.prince@rackspace.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 63e73ac7d1d5d43cfbbbb3921161d1e1c5621e5a
Merge: f0e01fc 23a4164
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 21:50:27 2011 +0000

    Merging trunk

commit 23a4164e4ce58706bbbf11af05786e48ee9c7704
Merge: 46dc180 f2447fb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 21:29:32 2011 +0000

    Adds unit test coverage for XenAPI Rescue & Unrescue.

commit 46dc180cb05a9ec27fb50574ad6a781ec579c3e3
Merge: dd0836e 047423d
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 f0e01fceb3cb7310271fe39aadc2d4b7836ce8fd
Merge: 64c335b 5b113eb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Mar 24 21:13:55 2011 +0000

    Merging trunk

commit f2447fbb6d69feabf384d6b404d1f2d0d1877200
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 16:11:48 2011 -0500

    Review feedback

commit a5f5df7d9368467eb6a18a153648db723bb1e499
Merge: 341a3f2 dd0836e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 15:56:53 2011 -0500

    Merged trunk

commit dd0836e65f8e9a2cb167a05be66603ed28e65d13
Merge: 982cfdd 91ae99d
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 341a3f21d766973081312a03b03bcbcf785e4e44
Merge: eb8a6d6 982cfdd
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 15:38:26 2011 -0500

    Merged trunk

commit b9180e716227f696729fb436b92f7374fd410791
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.

commit 91ae99d42e8efa3bcbb684789b17d125a9c811b9
Author: termie <code@term.ie>
Date:   Thu Mar 24 13:20:15 2011 -0700

    pep8 cleanups

commit 243a1b9b92ad749ed1d9850702b09575c3c92cd6
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.

commit 047423dd40078133d055d497f99537c1ea3c39c2
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 23:00:16 2011 +0300

    style and spacing  fixed

commit 8ebdf52b528bdf359468d2af88f41573d70557f9
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    better error handling and serialization

commit 9b66513c43384ccc7a0892fb4d88e7e86b60b428
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

commit 7c9e6389a314db0a7f43a9e98e45719fdb56a7a6
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    add an example of a versioned api

commit 8faacf3f424f76665e24a39239069c255a85c20f
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:47 2011 -0700

    add some more docs to direct.py

commit 00168de69eef144d86eb6e83cf941075d946875f
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    add Limited, an API limiting/versioning wrapper

commit b8db2ba23a215f14449551302387567e3482ad18
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    improve the formatting of the stack tool

commit 1bc10fbc8434c57dd78326e895c81b98c3a063ef
Author: termie <code@term.ie>
Date:   Thu Mar 24 12:42:46 2011 -0700

    support volume and network in the direct api

commit 1875413b48bbca40d4fe53c615eb540a403b69e7
Merge: 976bee5 982cfdd
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 15:36:22 2011 -0400

    Merge w/ trunk.

commit 5c569750cd1da9c0d528437fa2a30b6fccea64d9
Merge: edb06ad 982cfdd
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 15:35:41 2011 -0400

    Merge w/ trunk.

commit 4ee110858d65392ef953a45f4b892b895c3dec15
Merge: 282cdb2 8c80e4a
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 982cfdd457828b80fb7126b54b4e06216ada8e6b
Merge: 8c80e4a 5458d69
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 5458d692e4770248ddf4570a95bc65c84ebbfc8c
Merge: 70f7d92 8c80e4a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 12:04:24 2011 -0700

    trunk merge

commit 8c80e4a71c9d1c3bc640094f8323530e32471f6d
Merge: bd67e81 621ccbb
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 eb8a6d67b32bab240516e30b643d6cd74a7b040a
Merge: 76ca03d bd67e81
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 13:36:43 2011 -0500

    Merged trunk

commit bd67e81d82554ac5648a710b9c2412298e74d697
Merge: c83def4 88b32cc
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 c83def46987eddcd01358ae2e0cc25b1bb7b7eec
Merge: 6b93b65 175acd8
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 76ca03d68be85463c4e3393f0e588e0b144c78da
Merge: ecc08e3 6b93b65
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 13:10:22 2011 -0500

    Merged trunk

commit 6b93b659a8258019e3040b459500740d150f6c9a
Merge: f6b649a 23ce81b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 18:09:13 2011 +0000

    Pylint 'Undefined variable' E0602 error fixes.

commit f6b649a1d0daf25414fd23099619e8aecbbca7f8
Merge: dc262eb b3454d7
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 88b32cc171435c547426ae7c01964f4103012ba3
Merge: 6753779 dc262eb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:59:25 2011 -0700

    Merged with trunk

commit b530bf8574025b14276137c3dbb71ffa2aebcb07
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 13:56:25 2011 -0400

    Reconcile tests with latest trunk merges.

 etc/api-paste.ini |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 23ce81b8bc3f6c01ad4a37b53db799c55da52c1b
Merge: c2ae305 4254d9d
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 dc262eb9f647223f4f6cb850ab3582f7703b83d9
Merge: 4254d9d 194e3ae
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 edb06ad114f3fba2d287acbbde0eec675d6a1470
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 24 13:52:20 2011 -0400

    change names for consistency with existing db api

commit 282cdb23e4530cd79e9c40ecdbc1893cb6ea255d
Merge: 291a608 4254d9d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:51:15 2011 -0700

    Merged with trunk

commit 291a608a624ab2f6e0b91fb43f64dc16cb8b61fe
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 10:49:19 2011 -0700

    Forgot one set of flags

commit 12c113c878290f19e2cdb10eb1dd1c2364479df3
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.

commit 4254d9dd09764b501a2db6c545e278d39f80649f
Merge: 5b113eb 534cd6b
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 90c10bbb5052e250c03fe635bd71b15ad453f0a1
Merge: c008b3e 5b113eb
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 13:27:41 2011 -0400

    Merge w/ trunk.

commit c008b3e883935b53169c4c245578627c649eea7d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 13:26:57 2011 -0400

    Updated to use new APIRouterV11 class in tests.

commit 5b113eb9eececb962764b9c637944fb06dffc608
Merge: 4a94715 7b88176
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 976bee5eda08b2dbcbcfd51644f62949f751f569
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 12:57:49 2011 -0400

    Docstring fixes.

commit ec84323045316e1cff4887faca1931ce604cb694
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

commit 101d5b7930822bc8422f0611ebd1b2511d15f4b7
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 12:46:39 2011 -0400

    adding versioned controllers

commit 2ff62415faaa82031505275bec2288055be066cd
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Mar 24 16:38:31 2011 +0000

    Addressed issues raised by Rick Harris' review

commit f68949b468425eafa48a2c9f51982f8dbcea31ea
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 16:36:37 2011 +0000

    Stubbing out utils.execute for migrate tests

commit 4a94715f18b0c59a8214227eee8d9e815c16e645
Merge: 95c3177 36db85b
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 e1dcae7496d3bbdd4121c4d8cf3e527d1fd469c7
Merge: e58a03f 95c3177
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 12:24:40 2011 -0400

    Merge w/ trunk.

commit 722d708a5990a204543b9a9237f1a8f5035b9f0f
Merge: 9fb737a 95c3177
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 12:21:46 2011 -0400

    merged trunk r864

commit 0daf56a36774770249c6189495299d64fb82f792
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

commit 3d8e74c4a540afcdd0717b5882e2f60db2ceeb4c
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.

commit 92b55cb5e5cda66ae0e902f40dda9e5a2f77a662
Merge: 18a875a 95c3177
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 12:09:43 2011 -0400

    Merge w/ trunk.

commit 5eb186c07c2cedcc022a65fbe036fd1b126fa7f0
Merge: 0cd3612 95c3177
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 12:04:58 2011 -0400

    Merge from trunk

commit 2c4892cb9bc0360eb152645e96ac29115c3209cc
Merge: 903accc 95c3177
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 11:48:29 2011 -0400

    merging trunk r864

commit 50846a06dad282aa94e3d6772d46dcf350526fa8
Merge: 57f8dc4 95c3177
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 18:40:14 2011 +0300

    trunk merged. conflicts resolved

commit ecc08e38e82343e15c647eb03a3145ee8b153961
Merge: b3567a1 95c3177
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 10:32:09 2011 -0500

    Merged trunk

commit 6630a64c53c3413264268fa687d8d636dd629ee1
Merge: e195c08 95c3177
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 15:31:45 2011 +0000

    merge trunk

commit 93a443193c1a01955e29e865b87a07c20320b3a9
Merge: 2edf3bb 95c3177
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 15:30:37 2011 +0000

    merge trunk

commit b3567a1ac00f9d1a4e887b182db9764e1065d733
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 24 10:30:09 2011 -0500

    Small refactor

commit dfc2e3b92458c4504a26f98b3ee162ccfdf38e30
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 10:34:34 2011 -0400

    Merged trunk and fixed tests.

commit bebada20d9fec40f890172597478a673d6b546b6
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 10:25:36 2011 -0400

    Couple of pep8 fixes.

commit 57f8dc4fecd66c1399473ce435ff848dccd15ebd
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 17:24:44 2011 +0300

    pep8 clearing

commit ccb89ea2da59bef9e20d7ff4423388e060e5f0d6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 10:15:50 2011 -0400

    making servers.generate_href more robust

commit f49f39b1f091e501c669ca605f4d1eb35badcc05
Merge: 3806202 95c3177
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 24 10:10:54 2011 -0400

    Merge w/ trunk.

commit 3b56a4a7417745436cfc966c0d417d4f4c7d2cc3
Merge: 82375b6 16e686e
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 24 10:06:25 2011 -0400

    merging trunk r863

commit 95c3177068881c75804b92c2d86f97ff568f5d6d
Merge: 16e686e 9185da7
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 24 14:02:17 2011 +0000

    Fixes lp740322: cannot run test_localization in isolation

commit 17f7797e6d3d3db515436dbc09803d83f1be312b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 24 16:53:32 2011 +0300

    couple of bugs fixed

commit a82264c3b38f9478f081c92ce82c3e388fda618b
Merge: ae64fad 16e686e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 24 09:13:36 2011 -0400

    Merged trunk.

commit 63c9220ae16cccd9e09866bc3d83d276dfdba759
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 09:12:24 2011 -0400

    Dont use popen in dettaching the lxc loop

commit 216f902b25b876cc147f9b0822ce2bbb46f78005
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 09:07:57 2011 -0400

    Fix up formatting of libvirt.xml.template

commit 70f7d92afd3967c7a9a6dedd7ae5a09f37a0a13b
Merge: 658eb6f 16e686e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 05:10:01 2011 -0700

    trunk merge

commit 658eb6fccf1f3b0a04f6494174eb0d55582f2694
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 24 05:02:54 2011 -0700

    fix based on sirp's comments

commit e647033ce615a160160bdd7edb42643d0583eb40
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.

commit 8ef03857e1290bf9f0df4ecadb7096c94fbdf8c3
Merge: 17e9af0 16e686e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 24 07:29:07 2011 -0400

    Merge trunk

commit ed925d4679ae4142e31f349ef0e834a32f4e73a0
Merge: 000510f 16e686e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 11:06:17 2011 +0000

    merge trunk

commit b0d378ab48d5d095dcd51cc3cd126e39144ae0f2
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

commit e195c0827baab43efc6e337d3660fef546f7da4c
Merge: 9f3c2b1 16e686e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 10:57:52 2011 +0000

    merge trunk

commit 2edf3bb648132143ad0753decf2e4940a772077e
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

commit 48f969ba85d3f9009ed216810dbe4108bfaa4c88
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 03:28:59 2011 -0700

    pep8 fixes

commit f20dd260415534e14f155e9d75fee10e50605b6e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 03:26:32 2011 -0700

    Test for attach / detach (and associated fixes)

commit 16e686ec063b861c4a7965eab0fb2f974668b145
Merge: 5108b7f 9fc1fcd
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 9fc1fcdf1c3d6b28bb08c33e7f22ce3088aac45c
Merge: 015ccde a34f5b3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 10:52:41 2011 +0100

    Merge trunk

commit 81eb295d12c29fd235adc4907adbc73a1741daa5
Merge: 3bc1774 5108b7f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 09:38:12 2011 +0000

    merge trunk

commit 5108b7ffd09271f9e8ca6b54a3aa8300f6021def
Merge: a34f5b3 fb22fff
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 fb22fff99137e3ce4574a1c935fceda572d6a641
Merge: 3f2a6ed a34f5b3
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 9674c71867a021ee1c3658613313705ba9aa39bb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:37:14 2011 -0700

    Added simple nova volume tests

commit b62af41f967838ff8ceae25ed7bf4b9dc33b73e7
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 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 0f7dc223ed9557d405130721d1b8b88a9f0c617c
Merge: 8314788 a34f5b3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:05:13 2011 -0700

    Merged with trunk

commit 83147888572948a554f32f3efd3531452f9e1b47
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 01:03:41 2011 -0700

    Added volume_attachments

 .bzrignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 7b8817633ca985f7090f477795acfa0f31d9b6ff
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

commit 3b2447fee05e53c7312c3179896abcfabd6b661a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Mar 24 00:10:28 2011 -0700

    minor tweak from termie feedback

commit a34f5b3d7886c6b4a635892f63260449630000f4
Merge: 4504128 8b548d8
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 8b548d8129043889b9516dffb688b16ac5b46ba3
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:41:38 2011 -0400

    Fixed the docstring for common.get_id_from_href

commit 6dc129e077690e65cee43858fe05c8dd1b7c0f85
Merge: cfe315d 4504128
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:39:57 2011 -0400

    Merge from trunk

commit cfe315d935d5eacc40d6d03810a0952d1bef94f9
Merge: 919fe6b a50cf93
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 24 01:08:17 2011 -0400

    Merge from trunk

commit 4504128d739185251e5aa5676bd84eefd87baed5
Merge: f73df18 7b89ea7
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 24 04:36:23 2011 +0000

    better logging of exceptions

commit c6e4ca10c4e6ec3d94ebb3025ff0bd8bd00fceba
Merge: 6863533 f73df18
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:18:32 2011 -0500

    Merged trunk

commit 6863533ff14fa5feb8eb2af0de8127bd586a84a0
Merge: 4be7951 ba16d24
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:16:46 2011 -0500

    Merged trunk

commit f73df18c55c81e57a88a5167f1187bdad7340ed3
Merge: ba16d24 c8f581a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 24 04:14:36 2011 +0000

    Fix issues with certificate updating & whitespace removal

commit ba16d245643deafcf22861d65c60e3195044a4b0
Merge: d6f6549 c665d89
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 4be79514cbe04923ca6e8a4278928962390729e8
Merge: 57b9e12 d6f6549
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 23:09:51 2011 -0500

    Merged trunk

commit c665d89a85d4fc53178b29c64d9984cd2a24db3a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 22:55:04 2011 -0500

    Added hyperv stub

commit 194e3ae5f6295d78aee576b5f676b7277471ca4d
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)

commit c448528bf38d2bf4e99d3e27e6482f1827a5e727
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 11:54:08 2011 +0900

    Remove a blank line.

commit 3f2a6edc4ed1c3d1574b86c61e6b7e12ee1acb83
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:15:41 2011 -0700

    pep8 fix

commit 315e1f887f63db525366dd65f6369f597f389daa
Author: Muneyuki Noguchi <noguchimn@nttdata.co.jp>
Date:   Thu Mar 24 11:09:15 2011 +0900

    Split arguments of _execute in the iSCSI driver.

commit 3bc1774f81df16d24e9e31c35210bc87e490b762
Merge: f469691 d6f6549
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 02:04:57 2011 +0000

    merge trunk

commit 6de2f99d286516a9c2799d02fb307d7a05cc21ad
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:02:20 2011 -0700

    Added revert_resize to base class

commit f4696917059af4199e4fe1a0a97fa0ca2e3b8b9b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 24 02:01:46 2011 +0000

    Addressing Rick Clark's comments.

commit cb17c7af0f971f32ec78ee2d5e9ca6e21a18d1f4
Merge: 9340f40 814c164
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Mar 23 19:00:25 2011 -0700

    Merged with lp:nova, fixed conflicts

commit d6f6549de50cc10b424c478322e6e100f6ac3703
Merge: 814c164 30a87b1
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 9340f40a922eb7b81233bc81843fd19811c0dda5
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 :-(

commit 4ab9decdc326ea7248108f32eb4b002e9a2edd07
Merge: a50cf93 1f5eb33
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 814c164d59ee61f45e51f42a60ebb070cd57479f
Merge: a50cf93 1b53983
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 1b539834ff20c51be54d79cfc24de49482978bb8
Merge: 592dc5b a50cf93
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 24 00:51:08 2011 +0100

    Merge trunk

commit 66cd1edcd54f27d21a6cd19273cfe35858371d82
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

commit 1211e52f6d8af058db4b60cc620fc043779a71f9
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 18:34:47 2011 -0500

    Review feedback

commit 1f5eb335b677a06c6206f15ebc4d82fefc34aa4f
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

commit 9914f75a918939225eeaf2c5d51657517e9860b3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 15:55:37 2011 -0700

    clean some pep8 issues

commit dc4730db880908f1f7ab68e3cdecbf8c4986a058
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 15:53:46 2011 -0700

    general cleanup, use whitelist for webserver security

commit 151d15c61a8ba8b2e8d11b103016f54c36fd6299
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 17:15:41 2011 -0500

    Better method name

commit 043d02bb4958a14dce8c5b973a62b2b197ab5c6f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 00:56:56 2011 +0300

    small fix

commit c388d8ede95235fcddd4aea39121638a534db9cd
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 16:56:54 2011 -0500

    Added docstring

commit a50cf93e44f4222a845b0d874a97608160347cb5
Merge: a5a48ac 833c074
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 a5a48acd4c44f95f1444059f678e60f58e0291c5
Merge: 6d57659 0195a7c
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 46f875dc0b87833a6927d16195696025fccf474f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 24 00:36:07 2011 +0300

    migration gateway_v6 to network_info

commit 833c074a6eda7c3bebc8a319def09ac8761ce9db
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 21:04:42 2011 +0000

    merge prop fixes

commit 919fe6b2e9ef245dbf04e75a6d3af40e3393be2f
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 23 16:51:30 2011 -0400

    Should not call super __init__ twice in APIRouter

commit 621ccbbba5f28c731b411cde651577ad6a133a5b
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

commit 534cd6b341c10a9495a08796e23c5345ce6e64ce
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

commit c7b19efcfb57f5f1a049edfa677bcb50709abd3a
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

commit 46d85e8bd64d184c8c35dfee8568e9afd99fdf57
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

commit a428c6f1f0956a28f451562640da448ba96a3da5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:55:33 2011 -0500

    Fixed some typos

commit 15a961ad46fb41850cdf673c734f116e91b94385
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:48:26 2011 +0000

    Forgot extraneous module import again

commit 15ac4e1d136e1888f64a327f1a0e754b1cf748ff
Merge: 982414d 6d57659
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:47:06 2011 -0500

    Merged trunk

commit 2ccc26421db1f71f061395d12801378d125c326b
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:44:32 2011 +0000

    Forgot extraneous module import

commit 982414d9772c7e0fbb8ed9013213bb8961302d61
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 23 14:41:35 2011 -0500

    Automatically unrescue instances after a given timeout

commit 36db85beef29f063ea7f54721149070e03e089c9
Merge: a7a29cd 6d57659
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 23 12:31:49 2011 -0700

    trunk merge

commit a7a29cdfe4e417a3556baebebce0c83a4601da56
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 23 12:31:15 2011 -0700

    indenting cleanup

commit 82375b67305e092082ae9365d62f7c83abd78390
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 23 15:17:34 2011 -0400

    fixing some dictionary get calls

commit e73db09247b5a2152558fccfe78eb04c2208cb28
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 19:16:03 2011 +0000

    Unit test cleanup

commit 8cffbc8a13e31173f96c3b2780b0e4e1be5fb600
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 22:08:22 2011 +0300

    one more minor fix

commit 6abb1dabd838067eecbd0c7222c0d84618a17134
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:59:24 2011 +0000

    Moving the migration yet again

commit ecfed45ef7b77f6131884f8ea01051c390d30bc3
Merge: f0a1ff5 6d57659
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:58:08 2011 +0000

    Merge from trunk

commit 4446ef76e7a9e8c33d0143bafc39bc76e838bab7
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:56:24 2011 +0300

    xml template fixed

commit f0a1ff5871e1f9f9b60f2abf54ba0d6ce30294dc
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 23 18:56:23 2011 +0000

    merge prop changes

commit 410c79bf59f8914cf2ac2aa3c9891a09fa1bc82d
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:44:58 2011 +0300

    pep8 fixed

commit 118fb3aed175af59a2b3286323729903af1ab1ee
Merge: 24d08ef c1f8113
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 21:24:19 2011 +0300

    trunk merged

commit 0e71f1b1680e8cb55edb13bf204cc63867cedfc9
Author: John Tran <jtran@attinteractive.com>
Date:   Wed Mar 23 11:16:22 2011 -0700

    added myself to authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 029b92db35eb392b7987d4a7f4997a4805e69e18
Merge: 0a7e089 6d57659
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Wed Mar 23 14:10:20 2011 -0400

    Merge from trunk.

commit 0a7e089d7738fddf3f9684659817b6f554e94ac2
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.

commit c2ae305860d24d4d3aa09a0ef28d2f70f1fc9330
Merge: d11f4ae 6d57659
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 14:04:53 2011 -0400

    Merged trunk.

commit 38062028fd8edc203b0ad4da8014730e14c40c78
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 23 13:04:44 2011 -0400

    pep8 fix.

commit 28564546438dbc7ca81482fe5b082f89d67dd996
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 23 13:01:59 2011 -0400

    Implement v1.1 image metadata.

commit 6d576593a8bf6993564faab2926a03d8b2816c09
Merge: c1f8113 0b2e470
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 24d08efe240d6ad32505166aa265187720df2c2c
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Mar 23 19:22:51 2011 +0300

    review comments fixed

commit 667c42a16d36a488052159d8216478586b0512af
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 23 12:17:48 2011 -0400

    add changePassword action to os api v1.1

commit ae64fadfafec54608fab3e1c5c818267d339651f
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.

commit a77654e1efaf6fa2f4648ea029ac6156e8bdc451
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 11:04:20 2011 -0400

    Fixed tests.

commit 4bc88dd0d3a7607d368374718285bf17f61fa07b
Merge: 122d701 c1f8113
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 09:55:05 2011 -0400

    Merged trunk.

commit 122d701567d65986e36ed88df2baca93917dd8d6
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\!

commit d11f4ae88ff1b07bf021dae785778495168fd0ab
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 23 09:19:15 2011 -0400

    id -> instance_id

commit 0b2e470ae440fb971bf53d4516d79a892657c34a
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)

commit 58fbede6d699b6c8a6177d9090e6bc8efbfe69b5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 12:39:14 2011 +0000

    Executing parted with sudo in _write_partition

commit c1f8113fc569d0042cacf9167edf6115adde1a93
Merge: 46cbff5 48b3cfd
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 62b5cc0dceb95d8f2ea5152035f8fabdbf6258e6
Merge: 000f666 46cbff5
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 000510f990114448f71d278007ddc96033891e13
Merge: 70842fd 46cbff5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:35:23 2011 +0000

    merge trunk

commit 9f3c2b1477a724b5d74e657ac620526c2657c9d4
Merge: defadb7 46cbff5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:34:54 2011 +0000

    merge trunk

commit defadb794dee426ad346cdc6b7cb1678e33631ab
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 23 09:34:34 2011 +0000

    removed excess debug line

commit dbc454e50caddb7da29bf4f8b3344547f403261a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 02:33:11 2011 -0700

    more progress

commit 56334a2c165ff8fd46c87324fcb25e68001f64f3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 02:06:16 2011 -0700

    use the nova Server object

commit 2086ebb9754d0f350bb67af7ec3596f0c6559298
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 23 01:57:38 2011 -0700

    separating out components of vnc console

commit 83a80f1c80fbe340108bd8800ac87314cb17fa07
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.

commit 7b89ea73e0eaa3294f1fa74ef25371558c5eb1f3
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)

commit 64c335b49e1259b284de5b955c39510fcf4be7d2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:30:01 2011 +0000

    Use subset_dict

commit 1bed0ac26d2e70380f8621b3f28dc03b15687ed9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:27:04 2011 +0000

    Removing dead code

commit 7e5badb5914c1d5dfbe773661070f05b60ba5b5d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:18:01 2011 +0000

    Touching up comment

commit 4282115923e868b393a3107c97fbd045b33051e1
Merge: 3cdd9a7 46cbff5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 07:02:52 2011 +0000

    Merging trunk

commit 3cdd9a7942f148307219e348fdcbac6da25fa67a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:59:26 2011 +0000

    Pep8 fixes

commit 76e340baff745c31e8086af240b75a8092df3288
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:55:28 2011 +0000

    Adding tests for owned and non-existent images

commit c18a1d5513dcb6d06576e0612ef75ce52d3cca7c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:26:36 2011 +0000

    More small cleanups

commit 46cbff5c9f93dba7a287a4de540bd515dda0e29e
Merge: 1f06aa2 8771d79
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 36fa8aafc31a8d82d58d20bf52c0fb7c239a327a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:20:24 2011 +0000

    Cleaning up make_image_fixutres

commit 839e35226c7bd7a5abb829517ec5dcfd3d0620fe
Merge: c78fac8 1f06aa2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 23:14:13 2011 -0700

    Merged with lp:nova

commit 01ba49e0bf3f488f508ac836be181c75fc1f32f9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 06:00:04 2011 +0000

    Small cleanup of openstack/images.py

commit a4e033232bd6785a9f3b9b42c2695edb5bf4fc63
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:58:52 2011 -0700

    Fixed up the new location of driver.py

commit 8771d798c203f80df43864f1595413ce9ef60475
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

commit 31a612c54b59b512f7e8447c634bd9ba5c596005
Merge: 0a01a89 1f06aa2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:53:08 2011 -0700

    Merged with lp:nova

commit ccef651858b490496e35506696b7a5c64ebdedbc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 23 05:50:53 2011 +0000

    Filtering images by user_id now

commit 0a01a89c97640281c004ab3ade39d29dc266d64b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:50:45 2011 -0700

    Clarified my "Yuk" comment

commit ffb287e69914d8ad14cd6297c5c91b5890aa2d91
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

commit c41435006004e974bd82ec0f04f36d5f4deeae4c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 22:45:15 2011 -0700

    Added space in between # and TODO in #TODO

commit cdcf44bc5f15f197cce216e193f796ce6f8269b6
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

commit 4f4c2b1399d0db90808b239b537cc73ffbee28c7
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

commit 1f06aa236af8437a03b7243a42d601302588bb13
Merge: 43a082d 0d086e4
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 23 05:29:32 2011 +0000

    Enable flat manager support for ipv6.

commit 43a082ded8b4b3584f361fbea887dcfac93f3703
Merge: bd1bbdb 73a1f84
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 bd1bbdbde3a8cf5bf3204269355063710d52a9a8
Merge: c7c49b9 d59c2a0
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 0d49b1dc9e305a72b1607a40707bcb848921d82b
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

commit c7c49b9a21ad435a70a2ce1cda90b6f674c82353
Merge: bb51451 235cceb
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 b7c65ecece8d0f799949d86f4c676b1ae3b0371e
Merge: 7cd85f6 bb51451
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 21:54:43 2011 -0700

    trunk merge

commit 30f8652768faf61c92d18b0ca9b1a9b77020bdc1
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

commit c8f581ae81bc703deda5ea6cfb45daad361d5084
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).

commit 4a13d04ecea671ab9fff6efde2f31324c6fccd3a
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

commit 0d086e436aeade5df86dc0c34d78fbde1c859a30
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

commit 63dc65477ef5b46f4cc06234be884b1df540ac92
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!)

commit bb5145186d4aa079eedd6acd87ed2581023015b2
Merge: f014f31 114d28c
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 7cd85f6489a108941c34c86c9c7bb7a6c3484f97
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 20:36:49 2011 -0700

    pep8 and fixed up zone-list

commit b1aa4892cf45c21c1c812dae9a51aadee9224a34
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 16:59:03 2011 -0700

    Support setting the xmlns intelligently

commit 9631e3012fb09098e97af068bdeec529ebf00d9e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 23:56:52 2011 +0000

    get_all cleanup

commit 561b1528f0491d9787c9f1c96cfc9871ee10496f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 23:49:24 2011 +0000

    Refactored out _safe_translate code

commit 6a875d2dd77365c9d486d2e3fa23e99f1d7d2fd9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 22 16:39:04 2011 -0700

    Set XML namespace when returning XML

commit f014f3160f1b24b93cbfb8a1fda6d9177fd99091
Merge: d7e8977 47a9e4e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Mar 22 21:41:41 2011 +0000

    Fix for LP Bug #704300

commit d7e89774272156b0e71ae66758d8fbcb37c396a2
Merge: d837c2b c40ff4f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 21:07:10 2011 +0000

    Fix a typo in the ec2 admin api.

commit c40ff4f731a9e11062fec6d24634283217596768
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 16:34:02 2011 -0400

    typo fix.

commit 6bc39860055f0b00b26a00bebcee4437b063ea4e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:34:00 2011 +0000

    Pep8 fix

commit 9853238f7f81f5c64f05c6c52f3e80d71b272987
Merge: c3d580e d837c2b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:29:04 2011 +0000

    Merging trunk

commit f2aa56e5795e74778e7c2856b6e695509ec3083d
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 13:28:19 2011 -0700

    make executable

commit c3d580ed8984af781522683e4baff50ff9c32111
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 22 20:26:45 2011 +0000

    Adding BASE_IMAGE_ATTRS to ImageService

commit 376a2016d9353c2e2cee1a091e65400f871c4758
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.

commit 61d04753e505d66f386431d8111b7026dd6b66d1
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Mar 22 13:25:53 2011 -0700

    add in eventlet version of vnc proxy

commit 516bac4cf83316879f0f24051b97fad54cbe013b
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.

commit 903accc68a18212d552b8640ceee350c514844e5
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 14:34:46 2011 -0400

    one more copyright fix

commit 9185da76b6944bf6da8a8ff1ec9dc5b6c9679361
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:28:34 2011 +0000

    pep8 stupidness

commit b69e17ff0dbd054e31a7b9184ea2c4c42e2bfb5c
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:24:00 2011 +0000

    Tweak

commit add81837f818039511adf0b12e1a7789c9148b2d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 14:09:23 2011 -0400

    fixing copyright

commit c9801caa7a1076ada19b6dcf972dd71d9a8c9cb7
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 18:04:09 2011 +0000

    tweak

commit d04dffaeae5c32b3d012ba70e7a8dc94d4094b0f
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:55:40 2011 +0000

    tweak

commit d20781f2730551e0a0952a2db1f67377171e3884
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:46:17 2011 +0000

    Merge stuff

commit 98e307c2d11143c7ea8b133d5b868632d1677213
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 22 10:37:56 2011 -0700

    Whoops

commit b3454d7aed13a07455f4086e6f27d5a439a2f695
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.

commit a385a495a042a6b5311759e805f4a6a42c8ed8c1
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.

commit 649284e190c1639e147fbef655ffb39ce9736100
Merge: cffbdf0 217b17a
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:02:44 2011 +0000

    Merge from bugfix branch

commit cffbdf018c8f0a1ef20b48381305a2f684b528b0
Merge: f6ba885 d837c2b
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:02:33 2011 +0000

    Resolved conflicts

commit 217b17a9b4184a7080b9ea9aa2733c5f5cdaff00
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 22 17:00:36 2011 +0000

    Fix

commit 592dc5b1acb7eac752ba116ebc839daed0a0a33e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 17:13:48 2011 +0100

    Remove unused global semaphore.

commit c08553e219e0923defb2577a86f0e1e3aead2e5b
Merge: d8c3e50 d837c2b
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 18a875a87cb5897db9fb60c2ef56c7d677c96788
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Mar 22 11:56:07 2011 -0400

    pep8 fix.

commit 015ccde48391f593d9bfefe58b230ee6bbe28823
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:53:43 2011 +0100

    Apparantly a more common problem than first thought.

commit fa419aef1ea7d5c43133694b9511d9d283b04ff8
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.

commit 71215bec481610bc441881e120c29b90ea5ca674
Merge: 06c8cec d837c2b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Mar 22 11:44:33 2011 -0400

    Merge w/ trunk.

commit 263a91a5e6d54be16f6324ad8ed3300e1a291667
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.

commit 62fcb4c3dd6b1f1c992baab6fce70d8bed4bff02
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:29:37 2011 +0100

    pep8

commit 57b9e127a69db5d733ddf0dce6f5e161bd62a879
Merge: 0a09e3f d837c2b
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 22 10:28:10 2011 -0500

    Merged trunk

commit 78b4cdda676f0ad6f3225d4f22ab30fc542a739d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 16:24:03 2011 +0100

    Add a test for leaked semaphores.

commit a1297fe842efb7d858a90bce97496175a25d8cea
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.

commit 215e2e2de54434e3d0db3e1ce3f89ceb634ee52f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:58:31 2011 -0400

    adding view builder tests

commit cb6d357bff976efaf502c766af2b662abfab6254
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 15:50:34 2011 +0100

    Add correct bug fixing metadata.

commit 06c8cec8fce55f43011da03cfc5042168c1ebc62
Author: Dan Prince <dan.prince@rackspace.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.

commit 51828d76916bd2b0171fcc8d024b9eb75c478e04
Merge: edc48f9 d837c2b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:29:24 2011 -0400

    merging trunk r843

commit 9fb737af4a90ea51fc2749801d2f563aff245ff1
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

commit 8dfcc23906b88bd436d0b98644449b456b6de5a1
Merge: 32dcff2 d837c2b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:18:27 2011 -0400

    merging trunk r843

commit 88274cb9f9a194ce23bae8b9fc042ae21b75143e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 15:16:08 2011 +0100

    Fix locking problem in security group refresh code.

commit 94a165b304138c27ba2779452dbf9398e70c4532
Merge: 8db4c25 d837c2b
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 22 10:11:42 2011 -0400

    merging trunk r843

commit 1c9ec8b7b4e10328769f37a866473abac60af4d9
Author: Dan Prince <dan.prince@rackspace.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.

commit 8b7fe72257391bf52c33dad1cf60ec729229e243
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Mar 22 09:52:59 2011 -0400

    Add call to unset all stubs.

commit d8cc448ef9977f00992ea65d7e9c7cfa9bea5ff0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:50:53 2011 +0100

    IptablesManager.semaphore is no more.

commit 92342816ce5aef9098fdf816ecfa6fb72ad6dc93
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:39:35 2011 +0100

    Get rid of IptablesManager's explicit semaphore.

commit be8206c2686caec8091c12c6fc7034b0575279cb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 22 14:37:02 2011 +0100

    Add --fixes lp: metadata.

commit ef7b4a3b136821e44c0c34d8e77cef569544b88d
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.

commit e2f1eb4eac8860b8e345427564604219d2d1e820
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).

commit 000f666015355729d5c66128b5ced8bb84e9793d
Merge: 3a6ac26 d837c2b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 22 12:36:53 2011 +0000

    merge trunk

commit 48b3cfdc54e02b4a94f59e130c2c16ecaae26416
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Tue Mar 22 20:27:51 2011 +0900

    Wrap update_ra in utils.synchronized.

commit 70842fd2e188f073170f1d6e895cb3316137402d
Merge: 3f4a5c5 d837c2b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 22 09:54:56 2011 +0000

    Merge trunk

commit 9fc56af7dc5159e98bfccecc558aaa69377f1c6d
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.

commit 0a8ce3cc2eddf78394d96dac8f6a2c632c3ea0d2
Merge: 477ee28 d837c2b
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Mar 22 12:07:56 2011 +0300

    merge with trunk

commit 114d28c0913691315e416f09b55d4d3f40adcf49
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Mar 22 03:13:12 2011 -0400

    vpn changes

commit 441f67225c14b8d69185ceaf7ac0f052e7b831f6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:51:14 2011 -0700

    added zone routing flag test

commit c1d5db70b793ef9292a9b1a5225267b9a6f7ecf0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:47:58 2011 -0700

    routing test coverage

commit 1c31390fe8911aabd6e01e49279538e969c111fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 21:41:41 2011 -0700

    routing test coverage

commit d837c2b390179c1d20b24b9e2350c6ef77378aa8
Merge: 747e1a7 4023538
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 b83c9a39d5298d2ae00156c1251fb302f1ef0cea
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 18:56:59 2011 -0700

    better comments. First redirect test

commit 2f2815d3e15d636aebb814d56f59073cd85c09d8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 18:16:35 2011 -0700

    better comments. First redirect test

commit 0a09e3f5b37ab456782c7a5f904974de30a45d29
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 17:56:30 2011 -0500

    Remove _get_vm_opaque_ref() calls in rescue/unrescue

commit b9a05ca29a4cf18a2b9dedf9dba34c84802467b6
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 17:00:08 2011 -0500

    Remove dupe'd code

commit 747e1a75d96a3b2d470f44d3cd7b2a9cdcb782c6
Merge: 352364f c2f4a55
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 21:41:23 2011 +0000

    Wrap update_dhcp in utils.synchronized.

commit ea93cb4952e087cbbfce5057b273d8c81059047a
Author: John Tran <jtran@attinteractive.com>
Date:   Mon Mar 21 14:35:19 2011 -0700

    if fingerprint data not provided, added logic to calculate it using the pub key.

commit 0195a7c9e8cf605a5bfb1b4804421cdaa1daf4b8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:23:36 2011 -0400

    get rid of another datetime alias

commit d59c2a045e855ad59ca920c8dd44b6a7110221ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 21 14:20:13 2011 -0700

    import greenthread in libvirt

commit d94656d4a99c889e17f0ae9f31b4e9792fd649f5
Merge: 01247a6 352364f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:10:34 2011 -0400

    merge lp:nova

commit 01247a6d4c8af918fd0c39af843c9fdac7c3a7b0
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 17:09:53 2011 -0400

    make bcwaldon happy

commit 08d93daab10b92396414ac1c6143423dc1f90d50
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:40:26 2011 -0400

    fix licenses

commit f77b0a6515ea44c111f7f5d84b0bb91b32bc8d89
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:35:38 2011 -0400

    added licenses

commit 352364faf29d67d1ee2577ed18ac23db711eeb9e
Merge: aedad97 cace063
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 ee1a26accb7ecf53616825c024cc21f26194a0d1
Merge: 043498b aedad97
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Mar 21 16:15:39 2011 -0400

    merge lp:nova

commit e673f0ba2d1ac58c6348f8e6bec6177373b81bf8
Merge: 6854866 fabff91
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 15:54:19 2011 -0400

    Merge w/ trunk.

commit 35e8d66a0c96fe13ec3ceb061ed37a5861d8a0bc
Merge: 41c301e aedad97
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 15:23:11 2011 -0400

    merging trunk

commit 30a87b16221f3a0b194808b30843b54b0e9ea30e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 21 12:21:24 2011 -0700

    Fix for LP Bug #739641

commit 41c301e31c470e7e6091ff4c14d93de408753947
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 15:14:24 2011 -0400

    pep8; various fixes

commit aedad974c8d109fa3fb2f62d7528f0bf0cac80a5
Merge: fabff91 aa31522
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 6854866d9a55a8359b808f0810403d7ff5cd2cce
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 14:25:36 2011 -0400

    Added Gabe to Authors file. He helped code this up too.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 08a6c34f040d9660d0600f64bf1d7528c599dac1
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 13:21:26 2011 -0500

    Added XenAPI rescue unit tests

commit 402353811a9abf48f60f09d095b5311778a5a676
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()

commit 8f88f1780d1de49067eb56423bac1c2d2bc79983
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 11:07:19 2011 -0700

    pep8

commit fabff91437bd435b1601ad19b483fa702ce3fd75
Merge: 60b7cbb 0f40bd6
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 a0089f341e226a83f7dc83b57d6ce93eed244508
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 11:01:34 2011 -0700

    more robust extraction of arguments

commit e58a03f0f83865a77490a845704d4d02b5462ffe
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 14:00:39 2011 -0400

    Updated comment per the extension naming convention we actually use.

commit 97bd295b3cd01f185e665700723a6cf6be156f88
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 13:59:26 2011 -0400

    Added copyright header.

commit 45aaf4ec097863eac0e38244e3c027c8ea3ce709
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 13:58:39 2011 -0400

    Fix pep8 issues in nova/api/openstack/extensions.py.

commit 63131a2d43abec66f6e1103b76035cd18bb652d5
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 13:56:55 2011 -0400

    Fix limit unit tests (reconciles w/ trunk changes).

commit 60b7cbb77f4458ef35ef773ed0cf0febc52b2aab
Merge: ebf8583 db6cf02
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 bb0c707c37cc242e79397a675c038f3a9b29a93f
Merge: 1a10ac7 ebf8583
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 21 13:46:08 2011 -0400

    Merge w/ trunk.

commit 0f40bd6cf6bc0e9f7c068a876678820ff26a550f
Merge: 718c76a ebf8583
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Mon Mar 21 13:44:53 2011 -0400

    merging trunk r837

commit 69f5aaf5ec858d77b2f1ca4449818696608f7971
Merge: b3c7819 5f6d6fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 10:19:58 2011 -0700

    zones3 and trunk merge

commit aa315225f94aca228a51ab1888447079a0267360
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 21 10:41:03 2011 -0500

    Added space

commit 5f6d6fbb72ed4591c1e6ca4b4c5fda722bbf9f6a
Merge: 33a8b48 ebf8583
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 07:54:06 2011 -0700

    trunk merge

commit 33a8b486be0bcc32c0327c21d5cfd02a6fe01ca9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Mar 21 07:49:58 2011 -0700

    remove scheduler.api.API. naming changes.

commit db6cf0208e00f7900677ddb1cdfe439e0df56c59
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.

commit 0a0e9c19d4e5caef73b3785965c57b0f496304e1
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 477ee2808ac83a788bdf72ac43f884dc1517d321
Merge: ee4a8f8 ebf8583
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Mon Mar 21 17:05:22 2011 +0300

    merge with trunk

commit d8c3e50f9501d6d13db97b95ab2251a3a1a3e93c
Merge: c7bbf21 ebf8583
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 11:51:58 2011 +0000

    merge trunk

commit 3f4a5c5bc055908e7b9e57ceb4cd09eb7c24e131
Merge: 15b4a80 ebf8583
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 09:50:39 2011 +0000

    merge trunk

commit 3a6ac262aadfcc871d38ab12d45b51de55c44a68
Merge: e45af33 ebf8583
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 21 09:50:09 2011 +0000

    merge trunk

commit c2f4a55bbbee7af6d0d7942f9499f50f88c6e560
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 10:03:57 2011 +0100

    Add bug metadata

commit 0086b2682af3ef0fbd8982aaf09ed16c489a03d4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 21 09:49:32 2011 +0100

    Wrap update_dhcp in utils.synchronized.

commit ebf85833adfb6c9788f91d1fc9ab55fe5b170887
Merge: eab7bf7 f99f0c0
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 eab7bf789e520a101bea951429de62fdaf9e038f
Merge: 375dc05 c707fb3
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 375dc0539792a586c141b9f5b2478fe4329f16e0
Merge: 04379b8 a0d0312
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 a0d031237f35a98ca2cfcacec42313a81c7ef525
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 20 20:06:22 2011 +0100

    pep8

commit 5059d0e2f5541755118afb90bf0db0762a671fa8
Merge: bfd26b5 04379b8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 20 20:04:51 2011 +0100

    Merge trunk

commit 17e9af0249d77a3571c0f47986d763056213eaad
Merge: 197d1e0 04379b8
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 20 10:51:44 2011 -0400

    Merge trunk

commit 04379b8d279cbd23cc39bfb7fd42d9eb8bdd38ad
Merge: 0604d54 ffdc35f
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 f99f0c07f15cf228c1456f1e76bac0f01e85ee52
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

commit cd9f162a6b7fd3d018aaa2c205487bab83694b60
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

commit 48f4b86e6bd26e6e5a1fbc09bbc4512e89f48105
Merge: 1a9287b 0604d54
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 18 20:36:33 2011 -0400

    merge trunk

commit 1a9287be7a991b2ba812488e1d58809e62a6a354
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 18 20:35:44 2011 -0400

    * committing ovs scripts

commit e609b6bde3072f4348acbfad63520a71c8852629
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

commit 722f45b5c773415bcceda398cdae57d7988d9ead
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

commit cb0f39639b52d70f6557bc237af0407793239306
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Mar 18 17:22:13 2011 -0500

    comment more descriptive

commit f6ba885af56e28da2653772cdc3c7c7238919ea9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 18 17:01:44 2011 -0500

    Seriously?

commit ffdc35f35f9e7c1460d5ff001b1f7417be665b5a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Fri Mar 18 14:34:37 2011 -0700

    Fixed netadmin smoketests for ipv6

commit dbd5564df55f8fe094019579041cd3ed54c8bc9e
Merge: 12a5131 0604d54
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 18 15:42:41 2011 -0500

    Merged trunk

commit 12a5131daaeab1c7211ebfb0fb8ac93ae0dba8ba
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 18 15:34:50 2011 -0500

    Better errors when virt driver isn't loaded

commit 043498bc207af91bf625a18158feb47c90748348
Merge: fcff6ba 0604d54
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 18 16:17:20 2011 -0400

    merge lp:nova

commit fcff6bafe30cc26511ce340eab51cf254839caff
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 18 16:06:43 2011 -0400

    fix date formatting in images controller show

commit b3c781966dcc2a216a396784b29410825f73d090
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:28:34 2011 -0700

    huh

commit 2a60ff7c55c6cee6666a1d49b90f8d5c160cb9b0
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:23:57 2011 -0700

    fix ups

commit f16609c88fe42072b797e856250055d60276073d
Merge: e2b2ee4 0604d54
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Mar 18 12:18:59 2011 -0700

    merge trunk

commit e2b2ee4331dc7b9bf407c0a2edbfb4f647eca2ab
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

commit fe6bea9c84ce9ead16b8db5b9d33ad1ca4d1b753
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Mar 18 12:17:40 2011 -0700

    cleaned up tests stubs that were accidentally checked in

commit a5764891863515808485c7497f01c77af210acdb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 12:00:35 2011 -0700

    works again. woo hoo

commit ffa95e3bbfb88e9d57ba888eb748b4efe766efe2
Author: John Tran <jtran@attinteractive.com>
Date:   Fri Mar 18 11:49:11 2011 -0700

    created api endpoint to allow uploading of public key

commit 06603377a8f158f42fbfaacf27f650a273074898
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 11:46:27 2011 -0700

    api decorator

commit 0604d545d5c7bdc121628a1d24a00f0add7b398a
Merge: 1d6e3e9 4b7f66a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 18:07:24 2011 +0000

    Cleanup of FakeAuthManager

commit 1d6e3e9b0993618450c47821c8fb25ae67c5cc0a
Merge: 720686a 3c4f992
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 720686a8287ce544678a1ae0ccb5fd37654f020c
Merge: 9638e40 36553ae
Author: Dan Prince <dan.prince@rackspace.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 4b7f66ad875bdade96984bd2cee83683f74cf69f
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

commit 9638e40e35da4d8648bb15e50c17a6716ea9d569
Merge: 563b80a e4369b9
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 9c817a0358e26bcc384288de892339d53d5d3d0c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 10:14:42 2011 -0700

    Avoid single-letter variable names

commit 2e7932ef6c1b164966af71d2b1142c235f0ea62b
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 18 10:06:36 2011 -0700

    auth_data is a list now (thanks Rick!)

commit ee4a8f8eebe6c80a22216588c5aad2041149a641
Merge: fdc4e4a 8b2eb1f
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Mar 18 19:37:00 2011 +0300

    merge with trunk

commit 563b80abe54de934efd0a6c9a070b89d3fe069b0
Merge: 8b2eb1f 7a072da
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 04a42818202a71eb4fd59d77c046a45af74f8556
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 09:21:08 2011 -0700

    results

commit 3323de761439f625051b498ad0b9c8c5c5f905d2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 09:02:36 2011 -0700

    fixed up novaclient usage to include managers

commit 36553aeb42dce6e087d418f8dce7153d0a187f40
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 18 11:12:44 2011 -0400

    Added test case.

commit 416c338687f6f5ff3a880ed21f20c5f91c49c2aa
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.

commit 08bdb1605c9f74e784b30a536483e0374d8e6c72
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 07:47:23 2011 -0700

    whoopsy2

commit dfcf2580bf3219314c5f30cdb8219f623f251cff
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 07:43:42 2011 -0700

    whoopsy

commit e2044fdfc8e31706a3a9cb877fd4a2167a8b9471
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 10:34:08 2011 -0400

    Fixed 'Undefined variable' errors generated by pylint (E0602).

commit 197d1e0cb535c38c30967caf3e005e327544d619
Merge: c1773ec 8b2eb1f
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Fri Mar 18 10:13:17 2011 -0400

    Merged trunk

commit 211af66c9e1922e2c8f40984e2714fd29a033592
Author: Dan Prince <dan.prince@rackspace.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.

commit 3c4f9926989095634351d1d599a20268d5428dda
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 09:56:38 2011 -0400

    enable-msg -> enable

commit 4c03829fa3b9859eb9f9c26f9200d1995d40d79d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 09:56:05 2011 -0400

    disable-msg -> disable

commit 1b1f3469326e8018179530fb33bfac53a7c124b1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Mar 18 06:38:02 2011 -0700

    enable_zone_routing flag

commit bfd26b55529a580d60d3b3846cf062d18273f928
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 13:17:40 2011 +0100

    PEP-8

commit e35c88bf3671b596b79cbf05ba4947a94c2eb17c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 13:14:37 2011 +0100

    Make flag parsing work again.

commit 44a4646a4a4d659bc2e1e18e8f26bbaa5966c2a5
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.

commit 34f3c22a1d6801b94087d1aba1b69ffa22e83376
Merge: c7ec6eb 8c43774
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 18 12:35:00 2011 +0100

    Merge lp:~anso/nova/smoketests_fixes

commit e45af33498fbb4ff725c43f58b13d9f47317849a
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)

commit c7ec6ebb5b79629012b523691cf4ab242f0c4dfd
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.

commit 26b52efb09cf1674fa13ea2df427db9bf26cd3a6
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.

commit 15b4a80eb7fa0c95c60e847adbd072548f1c03a8
Merge: 5f7f3c2 8b2eb1f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 09:53:28 2011 +0000

    merge trunk

commit 5f7f3c21302bffcc41b544cb678249b7f8022aa6
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

commit c7bbf21dcbff868c17bb0b49ac285cc3ba869e97
Merge: cc04b81 8b2eb1f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 08:01:07 2011 +0000

    merge trunk

commit a94e8b20eb0aeba27fda5f18882b0453c6ff2251
Merge: 0d80a19 8b2eb1f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 18 07:41:33 2011 +0000

    merge trunk

commit 895bbfc0fccb5f5415606a6c281461d2cadf6400
Author: Dan Prince <dan.prince@rackspace.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

commit 8b2eb1f5742bd9af35a925551deef63c9ed7540d
Merge: 4afb974 c5a2873
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 4afb9748cbdc309be09e1f3482298f88933a5bbe
Merge: 87ae88e 489d64a
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 87ae88e7f2e320a9a40e528b3a6df9f8836f1427
Merge: 4218851 19d5331
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 dd842399500a34b7cb85545066d6c062729d6a57
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 00:19:53 2011 -0400

    Final touches and bug/pep8 fixes.

commit 0cd3612a240ec02434d15d31cd0d960c89960bfd
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.

commit 5cc3670bc9ac469127217faf22382b53aec3f610
Merge: caa9c6b 4218851
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 18 00:06:22 2011 -0400

    Merged trunk.

commit caa9c6bd40b58f67009d2fc9300558b03cceeb29
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.

commit 8db4c25e79a70b851707db13b017368ff9fcbeb6
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 23:58:23 2011 -0400

    pep8

commit 9d2fb971a0d126cfbc68d8993fb8a24274ae50a5
Merge: 48421b7 53ca7f9
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 48421b711bd4fc21d6fe9e6828b9b6c308c2fdea
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.

commit c5332addfab9079351237b4069092103d142d822
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

commit a3ad4b05a30ef531cc1310b7730e2ead0e57c0a7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 19:55:55 2011 -0700

    decorator more generic now

commit 62843bf14bc3cc5c95ede1020ad73b0e81fd4521
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 22:30:34 2011 -0400

    Images now v1.1 supported...mostly.

commit 046557ea955a0e653d0269da220efdcc1914c15b
Merge: ece0600 d86fb01
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 19:01:09 2011 -0700

    fixed up bzr mess

commit 26a797e9e3ee09697cae93ee675cf371e8577d2a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 17 18:54:51 2011 -0700

    Fix for LP Bug #737240

commit ece06003efe099b66cc32e95b402ba9addb5ff14
Merge: 41d0ae4 ea8ca40
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 94932219f287e9efc0aa43dd5c5b96d53cc191d5
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 17 18:26:20 2011 -0700

    Fix for LP Bug #737240

commit 19d5331ac6c4fcf9d25825419cdeec914fac42a7
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Mar 17 19:41:16 2011 -0400

    Add topic name to cast/call logs.

commit 489d64acfe790172484bd93ccc525f62ac5ad7eb
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.

commit fda7187762ddf1d339e61f3901286c784acff6e8
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.

commit f6fa6ede6e2a0e66205ad71b2a469b5d377bba80
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..)

commit 42188511804be4cc1187ff28012ca2fc2ffbb3f7
Merge: 1db1fbc 2ed7353
Author: Dan Prince <dan.prince@rackspace.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 1db1fbc82ded57aecbaac165dd28ec5645bd7711
Merge: 0ea14fd 4eb488b
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 3aec9fd4bf9046ad5437d5359d5892cbeb48175b
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.

commit 0ea14fd9f928024ce3331738c4984ee2e36ef92f
Merge: 00fb5ac 38f373a
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 53ca7f90d26ae18e5e1adf8a1d8e5dbe0a4def53
Merge: b25c9bd 00fb5ac
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 17:31:50 2011 -0400

    Merge from trunk.

commit c5a2873e4c798fa85254fe2a016cfc1c00bf3584
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

commit 4eb488b49e1eb87744bc719b55c5044a8acac055
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:23:35 2011 +0100

    Fix mis-merge

commit 38f373a705f0123dcf91d65ab168c7f840283add
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 22:21:55 2011 +0100

    pep8 is hard

commit b937bd171a694be5135a8d517b8e6fbe8f4e2668
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Mar 17 16:17:03 2011 -0500

    syntax error

commit b46b52cb9a693254b06a9e3eb8776f9438e02bc1
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)

commit 00fb5ac5b0228f9e1c70ad31a2a923ee2de16182
Merge: 6ab53bf ca5400c
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 c06e7f42446247c11fcd7e0846d661faa45303f6
Merge: cd62da6 b381379
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 6ab53bf7ba1ea4738a3af003a51a5934c5c89d6f
Merge: b381379 2f8ed59
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 a0a23e484c3ffb960ab257b1e18a00916002648a
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 20:45:18 2011 +0000

    Pep8

commit d2a88a6bac4c63060cb4083b909a7206bb6c99d6
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 20:44:15 2011 +0000

    Test changes

commit ca5400c352dc330cb77ef84edac7f13ea128185a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:43:22 2011 +0100

    pep8

commit a6c7093000af4865d3e90383480c339f3a0b440d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:39:55 2011 +0100

    Adjust test cases.

commit 7719b1226c86fca0f5ab40b5fad300ec0da9e7d1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 15:31:48 2011 -0500

    pep8

commit 01b4c5b096dc71445aae9cdd5c2ee5fc0c955952
Merge: 316bca5 b381379
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 15:30:35 2011 -0500

    merge

commit 7a072da5b516c7862c287038c06a0b0c999f40eb
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

commit b381379562950aad256e58486f44b696d735d476
Merge: 34641b0 54b0641
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 e4369b922b44e75f0ba2daa8d10ec3037b196ffa
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.

commit 34641b05755139894f75b5d5cddb25f5c7709f63
Merge: a5abe15 4df5604
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 fa4d351953bb0ad650814ce400cb266a585d039a
Merge: d282496 a5abe15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:21:25 2011 +0100

    Merge with trunk.

commit d282496e089f7feed26db35cef10a909cf9da3e6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:06:55 2011 +0100

    pep8

commit 78da4d7f83898f7c152b529e630c1d51f2e70a21
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 21:03:11 2011 +0100

    I suck at merging.

commit b25c9bd8ca64e799d67c56ca279d2118dd5b87eb
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.

commit edc48f9259ebc916f04707ddf4998b53ac7db8f1
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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 4df5604f0b9e1de16a38004b95a1beaed3cc6e8c
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 19:34:45 2011 +0000

    fixed code formatting nit.

commit ed30bb059a87bde34b3ee38342e98d3f4578d857
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

commit 2ed735397a2a41ab66c8e02216c64cc98c6c096e
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 17 15:27:20 2011 -0400

    Move the check for None personalities into the create method.

commit 316bca571a307384e34c67289e56c1d6445065f5
Author: matt.dietz@rackspace.com <>
Date:   Thu Mar 17 19:13:09 2011 +0000

    Get the migration out

commit 5df369468a14c7583e9a5ede346fedbdd5a4e1c3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 15:04:28 2011 -0400

    get api openstack test_images working

commit 7354ef6a5247a15cd0f26d4726b461c83f31db42
Merge: 96d29eb a5abe15
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:43:15 2011 +0000

    merge trunk

commit 96d29eb8dddb5d77360c9f125a3e8791986dd717
Merge: 4ad40d1 72dfb7d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:42:18 2011 +0000

    Improved exception handling

commit cace063268e1055d40af988ecfa5c5efc911e145
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 17 11:34:14 2011 -0700

    better implementation of try..except..else

commit 32dcff2fa7af4fb60a23313a00623b258409a995
Merge: d561ea8 718c76a
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 718c76ad43b66e474e6165210441833b0cd9bff9
Merge: cf0831c 2f8ed59
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 fdc4e4a23e14b7a9d609d84a405c4f63ca6ad5e0
Merge: 91d4ea5 e2b8bc5
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 21:17:37 2011 +0300

    iptables filter firewall changes merged

commit c63f44c062d2b9ed154cdc6fe7fa89dec12dd91d
Merge: c0278cd a5abe15
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Mar 17 11:11:56 2011 -0700

    merged trunk

commit d561ea8a07edb01eba29d4e039be87c78922927c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:09:44 2011 -0400

    pep8

commit 63eee4c061b335b18a07c27b965d95e07c21b471
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Thu Mar 17 14:07:25 2011 -0400

    adding serialization_metadata to encode links on flavors

commit e2b8bc56cdd804a9913d31328978e6df3d55e4f9
Merge: 67a6dd7 91d4ea5
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 17 21:06:29 2011 +0300

    merge with libvirt_multinic_nova

commit 763af8b08fe0a00e0c754ca90c450d96a380d0c6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 14:05:08 2011 -0400

    pep8

commit af8cc0973967c2644e68e9d7d1a1ef3f9fd79e80
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 14:04:31 2011 -0400

    teach glance image server get to handle timestamps

commit 0d80a19302121963e8b6736d2b2f0636b87d39f3
Merge: 77aebd1 a5abe15
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:03:50 2011 +0000

    merge trunk

commit 2906858ecf7617e024c97cd1054de4fcf3db6ac3
Merge: a9dcb91 2f8ed59
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 77aebd1cfaa163e2a2255a8c6b7f93f794745350
Merge: 79bcd81 72dfb7d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 17 18:03:18 2011 +0000

    merge trunk

commit 91d4ea54d22e2719a62fe3b5a858c75a0b506826
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 20:56:25 2011 +0300

    fixes for NWFilterFirewall and net injection

commit 2f8ed593f831dbb2ad1aefb55542d13cd8b077ac
Merge: 0a14013 5925d4f
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 63efdb46d6de83f821fddb8d94100ad5d3de6188
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 13:50:41 2011 -0400

    handle timestamps in glance service detail

commit 67a6dd780f8fa7ead0c407683b8d90b00f0ff376
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Thu Mar 17 20:48:22 2011 +0300

    fixed IpTablesFirewal

commit 0a140131d808c1498063c165452898e3c429358a
Merge: f0f0691 a5abe15
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Thu Mar 17 13:42:42 2011 -0400

    Merge from trunk.

commit a5abe1550e5d5367ea52d795bc70a51074d67bc7
Merge: 380a160 26f2967
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 380a160b67894c2dd6a04016e65d142edbc64717
Merge: 184b637 db43a01
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 165da0fcdbfac3d3009c66a78a148b4d2c19da59
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

commit 184b637e9c7cd1a67b40da427f4d39264917ffb6
Merge: 72dfb7d 6b6f140
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 a840ba1d5b715bda6bb0feaa066f70c628a5162b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 12:05:43 2011 -0500

    Mapping the resize status

commit 2b89701bb378897c1a918e5810e3d671c8a2604e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 12:04:49 2011 -0500

    Mapping the resize status

commit 55bc083e5d56737c6c39dd68e86d16a88ecc4849
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 12:39:09 2011 -0400

    Fixed pep8 violation.

commit 4fc9ab06dbc5263356cb7873d9acfda835a6c8fd
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

commit 19172d283185a84a4975bffd75a955831d0c0a8d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 12:30:32 2011 -0400

    refactor to simpler implementation

commit 99d484abf0b13988ea4e6289d79b9d16d2e86255
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:24:24 2011 -0500

    Foo

commit a85caf797ce96eb888a09e9385ae502006088650
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 17 12:20:22 2011 -0400

    glance image service show testcases

commit 8018e24609c4216a0f7ecaf92c9500da430939f2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:16:59 2011 -0500

    oh come on

commit d90b19132830edfe3e7b7b7245df4b428e339197
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 11:03:07 2011 -0500

    refactoring

commit 1a10ac747e02761ae1283ea642b315f3dfb8ca61
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 17 11:35:32 2011 -0400

    Add tests and code to handle multiple ResponseExtension objects.

commit b28bea40fc34a1b884e21d91d5bee4d7b0d27096
Merge: d24068a 72dfb7d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 16:28:48 2011 +0100

    Merge trunk

commit d24068a0c361e035b6d68548bc38717a9542aa76
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.

commit daf887109d9cc191df3dba281cbcef4ddaf20193
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 18:22:48 2011 +0300

    bugfix

commit 6b6f14085205a662fc2d8430dfe4bb2b54dc1118
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 16:14:59 2011 +0100

    Remove unconditional raise, probably left over from debugging.

commit 940fc48792f1413c53523c4face046c9494b98bd
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 17 11:10:58 2011 -0400

    No need to modify this test case function as well.

commit 1722a8774ecaca3b17ddc41189535cf7ebbddcfb
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Mar 17 18:06:05 2011 +0300

    refactored: network_info creation extracted to method

commit 9bdf2cabb5000b6f0817addccfa1f9c3d592ae45
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 17 11:05:31 2011 -0400

    Call _create_personality_request_dict within the personalities_null test.

commit c07a5dde7ed73e0cb54492d130115f4e14f49f85
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 17 10:03:47 2011 -0500

    Foo

commit c1773ec5ad4708ef826872fc70cc28885bad5873
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:47:19 2011 -0400

    more pep8 fixes

commit 04e27320f1de9bd9dbf020762fbeecbcb81d1a1d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 17 10:45:46 2011 -0400

    Switch back to 'is not None' for personality_files check. (makes mark happy)

commit b5c36f33b65fa5769cd01919c24efec4accc2c71
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:45:31 2011 -0400

    pep8 fixes

commit 2e8997c93cbcc18f2daff92dbe5bc040b4a4c2e5
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

commit 4abeea3b1a4284e782cd14d709ced689f2ffbcf0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:43:48 2011 -0400

    more pep8 fixes

commit 025c97ac426061be42a7d5dbcde5f4018dcedbcc
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:41:55 2011 -0400

    Fix up tests

commit ea8ca402272ebfd88b602c3c9687184b937a1838
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 17 07:30:22 2011 -0700

    Replaced capability flags with List

commit a45157a7be10a9f908ac6ffb87afa2d6004bb589
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:22:57 2011 -0400

    Fix more pep8 errors

commit 092d660ea05f8ad3fed3a9870510ab9f729079d9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:16:37 2011 -0400

    Remove me from mailmap

 .mailmap |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 905cc384bb787f334f786edabc64fc1a0ab7193a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 10:02:40 2011 -0400

    Fix up setup container

commit 5d0f363946f00e2aab0eb33bd9c95074e2f95259
Merge: 863181d 72dfb7d
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Mar 17 09:56:56 2011 -0400

    Merged trunk.

commit 07e925e6c87f1314ccfb396f8f7486499a74aa0f
Author: Dan Prince <dan.prince@rackspace.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.

commit 0dfbbaf404c74e9ab3d4d9700b0811b59e7383c2
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.

commit 67e66a875418252ae8c03c24c23a69f3f697f58d
Merge: 443bd2d 72dfb7d
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 a6ba2649313f894c149a5680216f423811050927
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 09:17:42 2011 -0400

    Set nbd to false when mounting the image

commit 0ce307aab9f80c5382a93a82c9ebf286986fc35d
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

commit 9254023b90b00452f145f571eb2d4554b38b48e4
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.

commit e1cc833aa1ac0fac369bfa0a71564e891f3bb73b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 08:52:52 2011 -0400

    Remove nbd=FLAGS.use_cow_images for destroy container

commit f6ff07a537960bd504191e5cb1801b9a1974d282
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 08:49:52 2011 -0400

    Update mailmap

 .mailmap |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e30520cc157a5751098dc4f5b5ed5cefb8a963fb
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

commit a239e5fa213a82fc5d5e9f496d816e1b2c716dd0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:57:06 2011 -0400

    Fix pep8 errors

commit b341b836ed00d99cc1a0fc4f51d13739a84613f7
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:53:25 2011 -0400

    Update authors again

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 4ad40d14e36d4465d1c8034e432790105aab6ae3
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

commit e763736d94865ee34f00793c3a04057ae7ac7ed2
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

commit 7582bc6923a61939880af754f8c7929d8895fc9a
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Thu Mar 17 07:06:58 2011 -0400

    Update Authors and testsuite

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit db43a019d5206ffcdfefd1808a90911d7d9cec9b
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.

commit fecd6d6d55b743587f4c8d3ff38a5393b6262ebe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 17 11:37:50 2011 +0100

    Make error message match the check.

commit a9dcb91de0efbb06b72526f9814ce1704aaba4e8
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.

commit f0f1ec454cede6e8414acea2859c88c8705537ed
Merge: 2f013c9 5925d4f
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 2f013c9277f1d385eeac0b2cd5998785d738fafb
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 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

commit d86fb019cf64998ffa338851b33249fa7002f865
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:33:32 2011 -0300

    fix up copyright

commit db7bfc718cf2d695b5ee7eeda79d854430dadb7e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:31:06 2011 -0300

    removed dead method

commit 8887bc02e075379e942f72160178afdb79b8dc1c
Merge: be093a3 41d0ae4
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 23:28:28 2011 -0300

    pep8

commit 41d0ae471a4d67859e9b180021211e23231aab0c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:26:54 2011 -0700

    pep8

commit 9b2780bae4585ebe86aec376834ded4ba52246b2
Merge: da4b267 72dfb7d
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 17 02:21:33 2011 +0000

    Remerge trunk.

commit be093a3b64d77cb8e4ccb918f97f7af8afc351fb
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:21:32 2011 -0700

    cleanup

commit da4b2671dbfc35376979817b1a91f963a4ef3014
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.

commit 05e21683b6ff5676474775354c015739b0ff6538
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 19:04:27 2011 -0700

    moved scheduler API check into db.api decorator

commit faa7baa305c11004527961f7215e19d565e3e13c
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:52:14 2011 -0400

    Add basic tests for lxc containers.

commit 3daf90d837b59eb7e710fc5b9a847e7eddf5931b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:42:39 2011 -0400

    Revert testsuite changes

commit a925fa8b1bcf55b4bbfc004f74baec5d39657c7b
Merge: 3196f84 72dfb7d
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 20:40:42 2011 -0400

    MErge trunk

commit 67537794a46ca7f829de7d93ea89feafb9f04462
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

commit cd62da6cc7b45becc50508c8de97f0c62d558878
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 18:18:07 2011 -0500

    hacks in place

commit 61fd280f001f0efdc39f770ccaa1dd6707e3d079
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.

commit ca8c52374703ff51eccd7467811afb66c9055a2a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:58:16 2011 -0500

    foo

commit 68eeb3a01b8785d11e459f42ec6717685c6f9c77
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:56:48 2011 -0500

    foo

commit 1e933c0d0f84970ff4053245ab114708db6a53cd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 17:48:39 2011 -0500

    commit before monster

commit 7632d6fea2677b86291754b67c2f09a7cbc100d0
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)

commit c707fb3437a4c4dba79246e027c1f5672d6044e2
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 files changed, 3 insertions(+), 1 deletions(-)

commit adcb2f01d9591090dde3f9bf05e014e14631f625
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 files changed, 1 insertions(+), 1 deletions(-)

commit 588950ec52c4ba35ece6519cf10656c373d1f689
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

commit e9f145e9ec0f1bc718b1b7136c868711f15078f5
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

commit 5c21280ab6f590b9320417340e34888e7fa16caa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 17:00:22 2011 -0500

    hurr

commit f9d5850e1bddba93a47baddca68a53ac86a9e826
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:58:46 2011 -0500

    hurr

commit d9b3a59a31d2a94ad0b30a2ca066cee1e0cb65b7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 17:56:40 2011 -0400

    get started testing

commit 08592f9987b5ac9871e3804792725318b2703cc6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:55:58 2011 -0500

    foo

commit d1a25e8b16036eb199ad9d02d900eb793ea11ab7
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 files changed, 9 insertions(+), 0 deletions(-)

commit 9d6f4aa8ad702e3670af599d4b98bc7e3f51113d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 16:24:38 2011 -0500

    Again

commit 1b17f26fa6a43b6c44963a37352b6c6d5a0871a9
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 17:24:32 2011 -0400

    pep8

commit a81e1eab96abed4f1df025b420d0781135931daf
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Mar 16 14:13:57 2011 -0700

    converted new lines from CRLF to LF

commit d20d9989e49830a91de5a5fcf53cd1e1f72e8140
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 16:58:38 2011 -0400

    adding bookmarks links to 1.1 flavor entities

commit 63374e50e2b11a3fa310f8bafed8d9331732a594
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 15:41:53 2011 -0500

    Reverting

commit 72dfb7dd466e92e4fe83507c0ca4276c1f5abd71
Merge: 4dbbccf 4245e2b
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 16 20:36:22 2011 +0000

    Log the use of utils.synchronized.

commit 1da6292e3a024d23ce4e27273d9abc4241b62569
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

commit 46d64779861d7a088da5629a2670fb8e243634a3
Merge: ef18954 26f2967
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 19:46:12 2011 +0000

    Merge from bug branch

commit 26f2967b50ca7c12329cbadb6f7edf9e0d896d67
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:43:57 2011 -0500

    Dumb

commit fcb2310c5c3691295570bc50e2b85b9fde5f3ec1
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 19:40:16 2011 +0000

    Unit test update

commit 4dbbccf76a34f4ea0e8dc34b93bcde7afca7f05c
Merge: 19665dd 06bffa2
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 540ec3ea9863c8b891fc813984f6f159fccba380
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:35:04 2011 -0500

    Changes

commit 19665dd02e615a220578da116a79c89767954af8
Merge: 1f441be 1418fa8
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 5949e53bf2d20d204d30425f09b40f8d6003ba33
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 15:20:08 2011 -0400

    update image service documentation

commit 06bffa21e99011c365d2d92da312173b98d8fc6f
Merge: 80e682e 1f441be
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 16 15:16:16 2011 -0400

    merge lp:nova and resolve conflicts

commit 2b774938b1c434496f982d03b02e65118454d791
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.

commit ef189542420ec87bb446fe8c0c82288f77e62e1c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 14:09:14 2011 -0500

    Fudge

commit 1f441be766cc05264cd765939b6d94177c47e463
Merge: efe4f48 d456640
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 1e81ae7867853ef8406d324591acd004a10c0063
Merge: e9767f4 fd4de24
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 16 18:56:52 2011 +0000

    Merging trunk

commit efe4f4844bb9897282eacc6d214b92a080de2733
Merge: fd4de24 3151390
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 16 18:56:47 2011 +0000

    Add missing fallback chain for ipv6.

commit e9767f4ff154e5a959d8a7dec14b4f46d9ac5571
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Mar 16 18:56:31 2011 +0000

    Typo fix

commit 1418fa809351687290fea5eeabd10a806c0d89a0
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 19:54:15 2011 +0100

    fixed pep8 issue

commit 17fd6615efe9332f9342c95c0d39a8b02c7e43a8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:53:49 2011 -0500

    chchchchchanges

commit ee8e9a9d934c7353b83ec2348fc9e451d77be587
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

commit d45664018664363065f86475f122f47498cf43f4
Author: jaypipes@gmail.com <>
Date:   Wed Mar 16 14:49:25 2011 -0400

    Re-commit r805

commit fae77071225a4374866ceea6f8e4f6fdf2db6e64
Author: jaypipes@gmail.com <>
Date:   Wed Mar 16 14:49:18 2011 -0400

    Re-commit r804

commit ac725c7ecd7d6af85d1089d01acc34529f52f635
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.

commit fd4de24f8777ec28f1cf1b0154c430ae347b2113
Merge: 506fa68 95a5ce3
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 cf0831c02d612eb7d24705cabf73830226ae72d0
Merge: 684ed4c 5925d4f
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 14:40:42 2011 -0400

    merging openstack-api-version-split

commit a9be2e8f6a98e37b9d31964e222032315303e1cf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:39:43 2011 -0500

    chchchchchanges

commit b10a73924d45e4ae56e891071236bf05bc9db820
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:31:05 2011 -0500

    chchchchchanges

commit 506fa6871373badbcecde965bee9b4f30be7991d
Merge: 7aac035 7b23068
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 3aac86736d9a5f5fa6c885b493e1cc4d5e71137f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:24:51 2011 -0500

    chchchchchanges

commit 353d5ac1edb10d7085d6bdb88c585a22196431c2
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 14:22:29 2011 -0400

    Revert commit that modified CA/openssl.cnf.tmpl.

 CA/openssl.cnf.tmpl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e9c84f086bd7273d4ca1e1aa4b5faf5083676c94
Merge: 8058f4f 7aac035
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 14:13:37 2011 -0400

    Merge w/ trunk.

commit 8058f4f4f48ef1a0540daada53ed3e7860926c44
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 14:09:29 2011 -0400

    Comment update.

commit 5935d01cfc2e2a108c33ac27138dc83fb670a813
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 13:06:49 2011 -0500

    Derped again

commit e36de06c6b7a9617c42c5ccdc8fc98075fbf3e33
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 14:03:38 2011 -0400

    Move mapper code into the _action_ext_controllers and _response_ext_controllers
    methods.

commit 3a2b0f48d51f45386c300b2dd9020119d6e8d755
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 12:57:45 2011 -0500

    The geebees

commit 20e4623dad5820184f5a716c19a0fd719b3472c2
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 12:50:11 2011 -0500

    forgot to return network info - teehee

commit 5d1363dee543f5e6dffaa6ebcfe7651467804882
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Mar 16 12:44:38 2011 -0500

    refactored, bugfixes

commit 4178db9342f628716d2c057085e5042080f35191
Merge: a91b4ee 7aac035
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 17:42:10 2011 +0000

    merge trunk

commit 5925d4ff8ee5587474439e6bd9a179d5d6faa5db
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

commit cc04b811ea7286d83539e36ebe9b3e04398f3f6c
Merge: cc2e360 5314c86
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 17:14:39 2011 +0000

    merge trunk

commit e9b62088d1446b791f7a08ca345d61c3c9208bbb
Author: matt.dietz@rackspace.com <>
Date:   Wed Mar 16 17:09:13 2011 +0000

    Logging statements

commit 7aac0357641e66c575a6a2f593bf46c01cebf577
Merge: 5314c86 f04b878
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 225ee7a6556071553dcc50413236123bb0ca2c29
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:54:10 2011 -0500

    tweak

commit 696bc07a172e733ce22d1b7ee0765f7d32d9b5b6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:38:40 2011 -0500

    Stuff

commit 2c3c945e16888d7ab5c025015e3d7f851fa2a114
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.

commit 762661a12059ed3127aa365857c85ba60f3e7ea6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 16 11:26:40 2011 -0500

    Some typos

commit a1ae1634c1af430ec2e246ffd3ef6f8167140faf
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!

commit f2b7659e7484ba1ee66d6f121a3d70230e01f135
Merge: e92b62b 5314c86
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 11:05:12 2011 -0400

    Merge w/ trunk.

commit e92b62b869eae4a2b5e17dcf566d6ab52e33e3cb
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 16 11:02:22 2011 -0400

    Implement top level extensions.

commit 863181de51da7fa911e2d241eed2c482468ce564
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Mar 16 10:10:58 2011 -0400

    Added i18n to error message.

commit 3162d0f909ecf051ff248978d3b47630e27f72c7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 06:47:27 2011 -0700

    Checks locally before routing

commit 3196f847b1a3a592c9832919da20e84c445fd646
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:26:37 2011 -0400

    Really fix testcase

commit b2048b760eba7481e42875829af77dc95c9a5fa2
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:24:17 2011 -0400

    More execvp fallout

commit 0a201bd01ee24325895ae21d6301863eb68f646b
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 16 09:15:46 2011 -0400

    Fix up testsuite for lxc

commit 2bdce5260f2158fd6061eefd363c00090340cd3e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Mar 16 06:09:00 2011 -0700

    Error codes handled properly now

commit a91b4eec7b442b79f35dd08089cf418eb7250f26
Merge: ac3b9ab 5314c86
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:46:13 2011 +0000

    merge trunk

commit 79bcd8146836ee5e843f29a5441141b84d766403
Merge: c3c5466 5314c86
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:44:12 2011 +0000

    Merge trunk

commit cc2e3604f8ef85932b303f6b16bd195e554f966d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 16 12:34:39 2011 +0000

    Adding unit test

commit b2ef78efce2af7eb91d2ea9866bc265b6503d8c3
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

commit ef99b0277c8c30120090917d54edad777d9fc447
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Wed Mar 16 20:24:20 2011 +0900

    pep8 clean

commit ce468f13e76a430c78be99df669b71d516c6e131
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.

commit 000a8c576589b89f5959346d8408489b0fedd898
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

commit 54b802d6a1fd2a0432058f5c001211d0631b2a2d
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)

commit 7b230682a3e25804ca803d97b06dafa480eb58cc
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Mar 16 10:38:48 2011 +0100

    Fix unknown exception error in euca-get-ajax-console

commit f04b878b202ce3a0c6e41f926b98978847d470db
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Wed Mar 16 10:29:04 2011 +0100

    fixed pep8 errors (with version 0.5.0)

commit 3bbb870f2803e6171502a103c8efd0d8a159e633
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 23:22:17 2011 -0700

    Use integer ids for (fake) users

commit f0f0691a3a0e9d17150b5a28f6f960f01cdfe43f
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'

commit 684ed4c9d6928f36f4a4667d664d19a6ea0f736c
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 16 00:22:34 2011 -0400

    pep8 fixes

commit 5e7518fb664aab88140412c3120b369e9d7a6cce
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Mar 15 21:04:38 2011 -0700

    Fixed DescribeUser in ec2 admin client

commit b38c2375be8764a1c2cfd04efa29151e2f5c51de
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

commit d30aaba2eb10b1443b0413e8652bd3316d81cdec
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 15 20:30:27 2011 -0700

    response working

commit efee21f32761f909e19f145437360cc8563c65ea
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.

commit d742ba172411f05e061cea5d3818e2b113992b89
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Tue Mar 15 23:00:09 2011 -0400

    Add ResponseExtensions.

commit c0278cd483d466a4d5cb9b344b34098eb5dda3cd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 15 18:54:51 2011 -0700

    revised per code review

commit 83ad8da2c57d86fb7d05c53d23c9364f9ad81801
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 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit bc7e933c16963a3c63a6bcf0044ff5ba8921d86b
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 21:26:45 2011 -0400

    Adding newlines for pep8.

commit cc5fd18d1e84941792aadf9fd7876d5476c17cfc
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.

commit e353702a16adab975dc2a0ccf8e4bd4fa018af4a
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.

commit f1688966ae14bc899bd27a6564f68f974d294881
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

commit efaffad18f9d7b332afd31d2b23243ca2e758995
Merge: b14139d 5314c86
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 b3c5e25851001249d88d20abfd5d2b59218f55b6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 19:10:50 2011 -0500

    Plugin

commit 734ef0946eef0f9efbc7569f17c6131e11109713
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

commit 619186c0881a5d139f03a60338ff2f02df4a3c1b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 18:51:22 2011 -0500

    Tweak

commit 0ba1d37af20b9730c0e3d3ded8af02fadefe783d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 18:48:17 2011 -0500

    A few fixes

commit 80e682e3a52f5c1c6e89221f300c3d9487c1459f
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 19:23:46 2011 -0400

    pep8

commit 2644b012c4d061601bfeb6a406c2df84b99b04b3
Merge: d184d7d 5314c86
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 19:22:51 2011 -0400

    merge lp:nova

commit d184d7d0a0234a395447b29d25a382bdf601da2c
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

commit 0d74b5843766bf6f51974aba24c2e4acbbd38b7d
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

commit 65574de76c2593b43a630983ea93e82ee37771ad
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 17:37:07 2011 -0500

    Moving the migration again

commit 091ddacf8b906758eca988e0f318a70fb9289891
Merge: 27561fd 7a7ca5e
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 18:14:38 2011 -0400

    Updating paste config.

commit e966d0db3b0434eeaa172bc0b65c6fd185db5fca
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 18:12:46 2011 -0400

    pep8

commit 27f6ccdbf7e9c5ae27a591a8b215e76f69eab36d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 18:11:54 2011 -0400

    internationalization

commit 27561fdfad795bd0b58cd4698ac687cea3ce8c5f
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.

commit e278f5e8a8280166336af7df188bdee142068293
Merge: 87155f4 5314c86
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 15 17:07:21 2011 -0500

    Merge from trunk

commit 7cd7c489ddcae3f5c6b44bf8faf732fb9ebd6e60
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 17:56:00 2011 -0400

    s/onset_files/injected_files/g

commit 2b073adb0edc426a74f088629273358ae3bf6ce2
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 17:47:34 2011 -0400

    pep8 fixes

commit 4245e2b15ffa5df15a3d09406758c7eee784c36d
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 15 16:21:22 2011 -0500

    Add logging to lock check

commit 235cceb45c3ba2d2a8094304144779b41b79647b
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

commit 7c6ac31380aa20d2c88cb281532399f1f022833f
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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 86376b0174f59e03e94c851abe5a46366d35ce59
Merge: 3006392 5314c86
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 251af3ea96d397a61e5cfcf883c2837b72b2698f
Merge: e1e7855 5314c86
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 15 16:23:21 2011 -0400

    Merged trunk

commit 3a969929cb1670394e33ac41dbc3f4b0e82d9a98
Merge: 88dea33 5314c86
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 16:21:06 2011 -0400

    Merge trunk

commit 7a7ca5ee91df96bf674ae859df4c5f7132aa6c30
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 39a9342c2299ccf8b9b7d53fd70cdbcfe4959ced
Merge: 13c9b6b 47cfff0
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Tue Mar 15 15:05:43 2011 -0400

    Merge from trunk.

commit 5314c861f9f2273837b1127f41d80a48b07bb362
Merge: 47cfff0 4459568
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 55047781bf9df25512b324e0e1db5fccd15cf585
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 14:33:45 2011 -0400

    refactor onset_files quota checking

commit 13c9b6b85f6a97bda1da2ff5a3503b57e55d8f13
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.

commit 95a5ce3766f4bc618622b1e5088919cd005fe646
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

commit defbd6e4a2ccc3c1cd5a53f4bfe2274e5967a8f7
Merge: 00c1b12 47cfff0
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 15 14:19:47 2011 -0400

    merge lp:nova

commit 6e04566cd4f2fd961ee9296445d5f91f4d82f7ef
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 15 10:42:32 2011 -0700

    Support testing the OpenStack API without key_pairs

commit ac3b9ab26579dbcaf2591442eb846c3d38314857
Merge: 03957a0 47cfff0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 15 17:29:51 2011 +0000

    merge trunk

commit 03957a0c352a1ee0e0418aafa9ccbb7288c42b82
Merge: b820b7b 5e2ac53
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 592e18db0c2c44c3cc664f484a5cd582011dc212
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

commit 47cfff04c2fa829d0267919fcbaef96fa8aeeac0
Merge: 1851c58 0ac546c
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 e2123ed9ae099381dab7bd2ddf68b38285a6573e
Merge: b7245ca 443bd2d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Mar 15 09:29:46 2011 -0700

    exception fixup

commit 1851c58b7a759ef19f2891bfeeb3a7fad0f31645
Merge: c38a602 9b40bad
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 c38a6026b4414dd9eceb67383f5386dc1594581b
Merge: 72c9a18 b835660
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 72c9a18adefb0c919953f96aab8dbf4b0f3ea405
Merge: 0aa2ec2 fc96ce6
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 15 15:36:01 2011 +0000

    PEP8 0.5.0 cleanup.

commit 88dea331ac79a4f84bc9600220892dfaac11833e
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 09:36:02 2011 -0400

    Really delete the loop

commit 1ca06a7901909692a7468c21104f5f9fdb086ff9
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 08:05:45 2011 -0400

    Add comments about the destroy container function

commit b48ee6b4d102cedb5669fcaf096d8d02b6256457
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 07:56:26 2011 -0400

    Mount the right device

commit c11da8f8d33c49f9fdc850ab1df0b5b00839b096
Merge: ec9d5d3 0aa2ec2
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Tue Mar 15 07:55:14 2011 -0400

    Merged trunk

commit 31513901791eee51317e9f7062cdaabb2344996b
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.

commit feecfbc1f2743417b48582110bc2c6574f986ee7
Merge: e4d777e 0aa2ec2
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Mar 15 08:45:35 2011 +0100

    merged with trunk and removed conflicts

commit d0d5d4a9037576fe7243c7599aaae43fe6521a66
Merge: ae45208 0aa2ec2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 05:43:53 2011 +0000

    Merging trunk

commit 3006392c04a90637f7a6d99e3ed0b7fd4110a979
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:43:21 2011 -0700

    Reapplied rename to another file.

commit ae45208a662da4fb5009399c9a693d9d37e42513
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 05:37:08 2011 +0000

    serverId returned as int per spec

commit 4fd3415fb6486d202f3d656dd0fedb6ebaaae32e
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.

commit 5badeecce96c1df9249613892001042ca4119ebf
Merge: 29d2e76 0aa2ec2
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 29d2e760fdcb499fd5117c4108a2cacdb3b44cd3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 22:23:38 2011 -0700

    Derive unit test from standard nova.test.TestCase

commit 5ee116ac4d66641bcfbd32c1509f7343b4025cdf
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Mar 15 00:55:52 2011 -0400

    pep8 fixes

commit ddd71b894f2a5d4442679ca52189c20ef810ded3
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

commit 54b064118aa102ac1f5ac8e7f1a3c17c1b9018e3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 21:28:42 2011 -0700

    Fixed problem with metadata creation (backported fix)

commit f3650f2c0756b594ba54c4df22b12b79d7706395
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 21:01:48 2011 -0700

    Clarify the logic in using 32 symbols

commit 94120201eafd92195d3cd487f4ed045f4447224d
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'

commit 81313810b707b321f95b2e021f97cee8e4d45076
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

commit cf35c21c21089a714d08b394cd49debffd8254c8
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.

commit c383eea11e17bd9282be65bfdf67c179a18e4d74
Merge: 0aa2ec2 7076ca5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 20:07:06 2011 -0700

    Merge remote branch 'justinsb/bug732204' into bug732204

commit 7076ca5bdfd65c16e37227f57b5a2cabb3d3a83e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 19:57:30 2011 -0700

    Make key_pair optional with OpenStack API

commit c168323f741de5aad7d18632956ce0f7c9ae520b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 14 22:24:34 2011 -0400

    Moved extended resource code into the extensions.py module.

commit 7a00cbcd170a86589faf83ab5a641a695256b0b1
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 15 01:14:58 2011 +0000

    Moving fixtures to a factory

commit ec9d5d3f8d53af5dc926ee8394004f215507c141
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 14 21:14:39 2011 -0400

    Refactor setup contianer/destroy container

commit c32b4746f978a59c5caf3ed6d46175b46b59cde3
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

commit 0aa2ec2c217b428b2f3ccd7c52db01bb931228cc
Merge: 3a6fae1 ffa676b
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 6c03c86cd0b9f9a03b74e5561d7d840e1af4c44e
Merge: 26203e2 3a6fae1
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 14 20:07:42 2011 -0400

    Merge trunk

commit 3a6fae1fb42cba2d216fd98ed7942b8c51e1e79e
Merge: 6631290 99a6649
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 cfe332eb94b108360ff36d42badd1ec59b4f339e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 17:54:39 2011 -0500

    added migration to repo

commit 217339911fdf0d545a105664de76503690fb1f17
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

commit d5fb78e450ce0ab2c3eb98030282bf8823b59a11
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

commit b8356600e08917cdf065b43dd2280434f9f9f011
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.

commit 65f25c81130c7fd4951189b41ca626f37dd68819
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

commit 47a9e4eeae8fd432c4dfee3dbf0fd6c905630d9e
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 14:43:53 2011 -0700

    Fix for LP Bug #704300

commit 2f2b481ee1784adc5c396059834b42dcd66dcea1
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 16:38:53 2011 -0500

    fixed keyword arg error

commit 305ae75278fd0b61a9f5fb72e9b463bdd6799683
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:38:39 2011 -0700

    pep8

commit 5fe99379a692747a23767efdc5482b44b199fc31
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

commit 5101890060a6fa1f86c3af666a42cbd9cd421d7b
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

commit c3c54660757e4671dbed4ac6f745543a72c6ae7d
Merge: d940898 5e2ac53
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 21:23:27 2011 +0000

    merge trunk

commit fc96ce64c17b3d4418ef0b92ff74cff9f06bf950
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Mar 14 16:21:33 2011 -0500

    PEP8 cleanup

commit 1121a30999513bcfc268f9990b5d25be6653f526
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 22:18:11 2011 +0100

    Fixes other half of LP#733609

commit 4d7ee4ee02625098d29487d5e038be6a0ae5d6b5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:17:58 2011 -0700

    Initial implementation of refresh instance states

commit f68f9df9a0b58939066bb94a8076e4af5a1df9e5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 22:17:14 2011 +0100

    Add missing fallback chain for ipv6.

commit 99a6649618950f8c24ee053849a1147b4e14c528
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 14 14:02:27 2011 -0700

    The exception is called "ApiError", not "APIError"

commit 042481e434c7d151d1b13d2f9ebe1e307f11956d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 14 16:58:03 2011 -0400

    Implement action extensions.

 etc/api-paste.ini |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit 6631290bb6672d7c893b417510f022400d5d45b7
Merge: 5e2ac53 f95ec5c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 20:55:47 2011 +0000

    Include cpuinfo.xml.template in tarball.

commit fa9967980d4683007bcaddbaa078b84694ebfa18
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Mar 14 20:38:05 2011 +0000

    Adding instance_id as Glance image_property

commit f95ec5c0f936d27a075991727610fe390dae2d0c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 21:20:55 2011 +0100

    Add fixes metadata

commit f41a0008c44114502a847faffb128d7ff985b0f7
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 files changed, 1 insertions(+), 0 deletions(-)

commit 02724618c4b669c4f5ce0c35b2363a3222b6ca5a
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 af0bad50684f0bb10e8eebd51dfde98b2cdf75a8
Merge: 4a606ab 5e2ac53
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 12:09:57 2011 -0700

    removed conflicts and merged with trunk

commit d2194066cbec5a6b3345713555c746e6083ba09e
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.

commit 215337b99b11b014ea38f5409cb6816de0c54016
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Mar 14 13:32:22 2011 -0500

    committing to share

commit 0ac546ca4c0ac3d8560b51ee3a26d69bd3276846
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Mar 14 11:27:21 2011 -0700

    small typo in nova-manage vm live-migration

commit 5e2ac53fcb89e29c41a2a115e12dfa9a61537827
Merge: 886896d 466d973
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 4a606ab2a3f767b1d9088cfe3f50cd69165f270b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 11:08:33 2011 -0700

    Reverted unmodified files

commit 5f4501debaecd7f56cd15d13388f443c4c08f7fd
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Mar 14 11:08:00 2011 -0700

    Reverted unmodified files

commit 466d9733e2d8923931a8cfbc3ad2d0856e7f9b89
Merge: 656570c 29a601c
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 886896de5446aa183c127c34bf8c8b66c0d27c5a
Merge: 29a601c e2ade64
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 87155f4acce28026894af45f01ae47734ecf04d1
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 14 17:24:39 2011 +0000

    Test fixes and some typos

commit 3e08d59ea75d37a15fe0c5f1bd777fc9c82ce3fc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 12:07:27 2011 -0500

    Test changes

commit e93aa8049c5f9f90ddf412cb7420f595a375d338
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 14 16:59:46 2011 +0000

    Migration moved again

commit 564fa4314c749d1716ab3248c831601421e86498
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 11:55:55 2011 -0500

    Compute test

commit b820b7bb13a409ba4b605eaacab69772a13b54f2
Merge: b3f0dc6 29a601c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 16:50:35 2011 +0000

    merge trunk

commit d940898b54b199227699198de848b26d3588866c
Merge: 176e952 29a601c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 16:49:46 2011 +0000

    merge trunk

commit 29a601caae37ef814baf994b7e9953ff54a86c33
Merge: 2a1d4b2 1981890
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 528551b54030fade19e26cba3bfbe7ebd0e863ab
Merge: 3602702 2a1d4b2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 14 10:16:59 2011 -0500

    Merge from trunk

commit 73a1f8404d8cf49787d46c42724e69cb1a29dae0
Merge: b2d321d 2a1d4b2
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Mar 14 09:54:57 2011 -0500

    Merged my doc changes with trunk

commit b3f0dc6b05d6dc3a4cdfecb0db9e65c969ef5622
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 14:52:19 2011 +0000

    Fixed pep8 errors

commit 56a28f1a2e89ca2a06514cab1d862d7e9609ede1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 14:49:16 2011 +0000

    Fixed failing tests in test_xenapi

commit b2d321d6dbf29aa7ae70c596b0d4fbfcd85b3e14
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

commit 2a1d4b2c39d9201aca9a14d91eb59a92f250befb
Merge: e1e7855 f05a421
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Mon Mar 14 14:39:50 2011 +0000

    fixes: 733137

commit 19818909e6d943049fb305531292e78fc17481cc
Merge: e5c7986 e1e7855
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 14:21:44 2011 +0100

    Merge trunk

commit e5c7986d6268338208c0835b85fe06eba831c02e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 14 14:06:10 2011 +0100

    Add a unit test

commit 39f7c77d520fcbfae62bf181dc9c00f98552114f
Merge: b818fbc e1e7855
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Mar 14 09:56:37 2011 +0000

    Merge trunk (revno #795)

commit 407ab945d90b1272e3592a09ba73b9509d8279c2
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.

commit 26203e21132e1bcb96fb62f4978cf140101cbe08
Merge: 631f119 e1e7855
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Mar 13 21:28:20 2011 -0400

    Merge trunk

commit 176e9528df2f0504229deea3bcc249d1e474c454
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Mar 13 23:35:30 2011 +0000

    Removed excess LOG.debug line

commit c85508ac2aa82c25120ccad6c3db9984e3d22fbe
Merge: 1b051c7 e1e7855
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sun Mar 13 22:49:44 2011 +0000

    merge trunk

commit 3bb6f036fae938f7f7c2737cfb21fe0a1f0ddf5c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sun Mar 13 13:51:42 2011 -0400

    The extension name is constructed from the camel cased module_name +
    'Extension'.

commit 1b051c7ca9e15c0d0f3048337cc1daefc08943c3
Merge: 82f84c9 1aed2ba
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 e1e7855a1dba5bc48be4f44dfc7137a3a3757910
Merge: e353055 8c3abef
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 8c3abef978b1a9dbc85a52ac87bc4614ec8f84fa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Mar 13 10:49:56 2011 +0100

    Fix instructions for setting up the initial database.

commit 613da51853e5aa294c7e0453cae83d8c11e225d8
Merge: 128e55e e353055
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Sat Mar 12 12:26:20 2011 -0500

    Merge w/ trunk.

commit 14559b7a5df8d5dd422b96ee844cabb5e671ec45
Merge: e1db09a 0e13f1f
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 a5eccc6be8143e1400374d66d9aaf522a94c7e77
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.

commit e3530553267851193d5c1939cab5519c57cb0904
Merge: 0e13f1f c86f80a
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Mar 12 00:14:53 2011 +0000

    Use a consistent naming scheme for XenAPI variables.

commit c86f80aa46f813829650b52ee3d17c1fe48c758b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 18:03:19 2011 -0600

    oops

commit 5608673e14cfb41f34aa78b4fe72131766678244
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 18:00:34 2011 -0600

    Review feedback

commit 16dcbe113cbb376ec3e956b71c750bb029428e3e
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:48:44 2011 -0600

    Review feedback

commit 00bfc5c37ef1a38853b5d7b839c88f9371c0a76b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:35:37 2011 -0600

    Review feedback

commit 36027026015d5f48e14d5c09a816adcfb113430a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 11 17:30:51 2011 -0600

    Some unit tests

commit ffa676b15262c1e697496c8b0b71efdbf1d836e8
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 15:21:31 2011 -0800

    Change capitalization of Openstack to OpenStack

commit e1db09ad04f0b5ec72f8913369667d4443e615a4
Merge: 3331fe7 c3904d4
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 c9785d165b002c2a4742300bdf2e72f069b449d8
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.

commit e550a2aa3e07f1a73fec87beb5fcd0117e658ad7
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:13:10 2011 -0600

    oops

commit 5617696cc0d5cc804c724be9f2b4a3b955f78dc3
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 17:11:25 2011 -0600

    Review feedback

commit 0e13f1f6410cc7113f87ba08f36f0cd69789d7c9
Merge: 7bc3508 690937f
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 fbb35c358ae553d90c570364e33cd6cb482db050
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 16:58:18 2011 -0600

    Review feedback

commit 690937f50d04693a97cacfebe0a982886e03adb7
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 22:55:56 2011 +0000

    Remove vish comment

commit 7bc35081986b55ebb43e2b53bf0922d8fcddff23
Merge: afeb448 383db35
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 445956846b2e7521dacfd93a9de697edf856198e
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Fri Mar 11 17:41:10 2011 -0500

    Removed EOL whitespace in accordance with PEP-8.

commit b14139d651431d46d3bc8524a868e432d05815b5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 14:36:31 2011 -0800

    Beginning of cleanup of FakeAuthManager

commit 383db35d1091d6cb66e1138ae2378fb88a449d23
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 23:36:28 2011 +0100

    Make the fallback value None instead of False

commit c859976a10ca171238db8d509db3525edf6f8043
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Mar 11 23:34:26 2011 +0100

    Indentation adjustment (cosmetical).

commit 07c9fd74ca035de8036962664b29f5ce1d5f34df
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.

commit 7d52f61acdc798a90e58a7f6f7344e6045d34bbf
Merge: 6e07d52 afeb448
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 16:16:29 2011 -0600

    Merged trunk

commit afeb4486881adbe3fcbb00eea3610ef2274932be
Merge: 6058cf6 3d903b8
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 3d903b8a72f5ced46f8fa05c4306b78ce7b35e29
Merge: ae1a223 6058cf6
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 21:40:51 2011 +0000

    merge trunk

commit 5e21738c56d7233822d5a248c38d77fe68c0834a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 11 15:35:55 2011 -0600

    New migration

commit 6058cf6f65f24f9bbde24e4a13c3e61b4501a1e0
Merge: 3294a6f 5a9db40
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 3294a6fa4afe4aeabe13f0aa860cc4361093bc7c
Merge: d8fe4b7 b175c46
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 5769bea188266027bdad20540ae9fe95283253d7
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.

commit ae1a2237dff799d6050a94c6ae0bbd28b04bc3c5
Merge: 6d540c6 d8fe4b7
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 20:14:48 2011 +0000

    merge trunk

commit d8fe4b78027e182d881d35479bfc1aa0f72e24bb
Merge: c3904d4 de3ecaa
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 6d540c6a7fa5063bf7405ea5c95a5a1908ee7c0e
Merge: cad3975 c3904d4
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 11 20:03:18 2011 +0000

    merge trunk

commit de3ecaa52aff859ca1ca9353c31f94f162bfbf86
Merge: b723f48 1aed2ba
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 128e55e0cb0af44e33152a34cd1f9ef0b8851d03
Merge: bf4be74 c3904d4
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Fri Mar 11 14:37:44 2011 -0500

    Merge w/ trunk.

commit bf4be746ce12935614a4246f80c17d6a0ac0cfde
Author: Dan Prince <dan.prince@rackspace.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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 5a9db40da723a723b269fd9922e8982205b0320b
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri Mar 11 14:24:03 2011 -0500

    process_input for tee. fixes: 733439

commit 9a5f5b5dbd0b295a93d35166f2d241409fdef560
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 19:22:31 2011 +0000

    Minor stylistic updates affecting indentation

commit c3904d49aa614d9c3a14ee81582c76bd54c01b45
Merge: 1aed2ba 6248292
Author: Dan Prince <dan.prince@rackspace.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 c78fac895470593324a025d7be0c82671dff23af
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Mar 11 10:32:09 2011 -0800

    Added volume api from previous megapatch

commit 3331fe77f69b3848dff231bf49b2e13eb5657c64
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

commit 2bc3d9d0b6ed9ea4c608e84c748a825b64534f4c
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.

commit f1ba170e96aceb234c0551b8728faff68fea57ab
Merge: 2006741 1aed2ba
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Mar 11 17:44:14 2011 +0000

    merge from trunk...

commit 2006741e33703ed1abd3acc5353ffe5c9372bdcb
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

commit 6e07d523620a3aa06c4e61bc51fdb7ae65aadad5
Merge: 568969f 1aed2ba
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 11:22:56 2011 -0600

    Merged trunk

commit 568969f9fe1c6e9a08c02fcad7d35619590b1982
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Mar 11 11:22:23 2011 -0600

    Further vmops cleanup

commit f05a42167c4acf9b93b4ad483235f21631217423
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Fri Mar 11 12:09:20 2011 -0500

    cast execute commands to str

commit e2ade6494ac7f8ddbace15dfe28c5c31e544e167
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.

commit 5972bc40633e002ee76fcfda55481152b5f3d9b9
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.

commit 12e6c105b076d84a4d6e654df94dd92b9f6a358f
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

commit 47f32f55db3c4cf6c5b51f76b3dcd2d39e153069
Merge: 6fe4428 1aed2ba
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 11 11:44:48 2011 +0000

    merge trunk

commit 6fe442849d3a20c23fa9e75197adcf646723d752
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

commit c3d484cf7b6ea808a525f723be63cff5200ba68e
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.

commit 9b40bade94f3b5d5d5f907df8fc08b9518332d79
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 +
 2 files changed, 2 insertions(+), 0 deletions(-)

commit 624829248e301a4edcf4e6885c6ebf73d3688bde
Author: Dan Prince <dan.prince@rackspace.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).

commit bbff28d702ad74566e33affd4d24021fe8ec16eb
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.

commit 9eab3b4543a9c5715d9fcbddb0c50e5da6f8d388
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.

commit 526e146b0df7432209df323f9bad5f7e92da38cb
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Thu Mar 10 19:26:20 2011 -0500

    execvp: fix params

commit 796bc270267edf4cec8b92bedaa2f9a45c546c85
Merge: a8f3961 1aed2ba
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 10 17:11:03 2011 -0600

    Merge from trunk

commit 00c1b12fe6a580ec674a9b0491984e1ee7895db4
Merge: 3934945 1aed2ba
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 17:41:57 2011 -0500

    merge lp:nova

commit 3934945785ab4bd2d7f0810c059b5054e109f586
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

commit b723f485f9b52311f9e7066ae15340b606e676ef
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 :>

commit cad3975f9ca9af223275b97be1cd7d58c8e0c23f
Merge: 8440690 1aed2ba
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 22:29:20 2011 +0000

    merge trunk

commit afedaa0ae4be85d556aa70dba2a725c43650c41e
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

commit f7e3ae8494a315210b874801551cba267dd36f1d
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 10 22:20:51 2011 +0000

    fix minor typo

commit 8b6894826834dd32071f264e219b1ed84ab66224
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 10 22:14:53 2011 +0000

    Fix a fer nits jaypipes found in review.

commit 7558567ad056a25f466a51e55f76a9eb4d85c632
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 14:14:01 2011 -0800

    Pep8 / Style

commit 81a5296c1caab035c588e7c4e643892635144e20
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!

commit a8f3961b5fb492d0363aa9ac26c55fff56f29d8b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 10 16:07:50 2011 -0600

    More resize

commit c6b42233641f872712240a115bfba2bb3dd4bdb2
Merge: 1922d06 a0ee12d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:57:49 2011 -0800

    Merged with upstream

commit a0ee12d5d2549b4f03697483e8ebbc128d486dae
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:56:24 2011 -0800

    pep8 fun

commit 1922d06526999bca468eeffb74f27d63c93d6943
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:53:27 2011 -0800

    Test login.  Uncovered bug732866

commit bd61681b29f58ee682ccd5b94169706598718ed8
Merge: ec6da46 c98d193
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:53:10 2011 -0800

    Merge with upstream

commit ec6da46e8f31235cad9396cf8a6ff813f1fb1f2d
Merge: ef09bc2 3ea1efa
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Mar 10 13:52:19 2011 -0800

    Merged with upstream

commit c98d193916968b2817bbafe6fdf837d19ae21ab4
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

commit 3ea1efad491fa0ae95c15dbd86e730242db8a1e0
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

commit 1aed2ba49b2ecd4b25d46516653adb4a275c2f8b
Merge: da6e11e ef73e80
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 72c633e3ff869f4a7c546a60da64041aca188073
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...

commit ef73e80c9523e88046bb6a2ccb0bf412c111d873
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 21:31:47 2011 +0100

    PEP8

commit a2250b367af20eaf3c954e95b310b6a2511c48bc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 21:13:07 2011 +0100

    Add basic test case.

commit ef09bc2e987a833de90d1756ef07981bc791ee67
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

commit 9fe91c6919f3bf714234cfc2f3787b6975ace181
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Thu Mar 10 15:05:04 2011 -0500

    Initial support fo extension resources. Tests.

commit e99e4418c6f3fab4f1eff79c32c055020c5465e4
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

commit 8d8e72db6b207624c638a0f6f165e8205f14e91d
Merge: 68c1f70 da6e11e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 14:59:43 2011 -0500

    merge lp:nova

commit 68c1f708ffc8761b79822c604ad20a19f622945d
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 14:53:13 2011 -0500

    add docstring

commit 0fbadeaa9102bfb909e7c631b4565d68b1b8dbaf
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 10 11:17:34 2011 -0800

    fixed formatting and redundant imports

commit f6db78fca979a4f9f584751c8b79a14a52f6fd5c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Mar 10 12:06:09 2011 -0600

    Cleaned up vmops

commit 84406905644f1690fe1cb33ab6d730635c6ea662
Merge: 206535d da6e11e
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 17:30:26 2011 +0000

    merge trunk

commit da6e11e6852779f0024e91a2e2120496720a5b5b
Merge: c27b2d8 005e218
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 ba018b2de3f41947cf5368d87eacf8b827cff2fe
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Mar 10 16:42:13 2011 +0000

    Correct a misspelling

commit b3914f170bee27c0d2adf474e150c229cadfb6b0
Merge: b5e7045 c27b2d8
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 11:18:05 2011 -0500

    merge lp:nova

commit 206535d48a590d127a2ba50f6926c05b7e97b296
Merge: 97cf855 c27b2d8
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 15:48:47 2011 +0000

    merge trunk

commit 97cf855d58e0de4393138d8c0abb51c67cf46485
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 15:47:55 2011 +0000

    Use a FLAGS.default_os_type if available

commit c27b2d8a6cd842b4e6d8eb0950076426b2e08808
Merge: 0329277 b84b3a6
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 96b360647ebe6c70e9ecfe00990d348654cde94f
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.

commit b84b3a6a094a841e1b76e5f2d00872aaa24a0d77
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 16:25:18 2011 +0100

    Another little detail..

commit 03292777db60eb5ee4618be2a8e0dfd4c0be8d3e
Merge: 23b6b74 59e9104
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 23b6b745f3080eeade84d61227a3f887d0cbf4ea
Merge: d408445 44dc825
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 59e91045858c7a194e1f24fcf08f0539b439605a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 15:47:09 2011 +0100

    One more thing..

commit ee60dabc0d207de586251c1e223778b63de59080
Merge: e288a63 d408445
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Mar 10 13:59:43 2011 +0000

    merge trunk

commit 6dd957070d5d40c40d60402901754cc32ef38375
Merge: c55c25d d408445
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 14:45:19 2011 +0100

    Merge trunk

commit 688f79a5a1af106c962e54723f9c503f12d79c2b
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.

commit 6b16c244baeaf270afd1af7be6766ae7b3c44c9f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 13:45:50 2011 +0100

    Add bugfix metadata.

commit 82f84c974506f53aebee5f46c5e118159f4ee6ec
Merge: 34bb800 d408445
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Mar 10 11:13:01 2011 +0000

    Merge trunk
    Conflicts solved

commit 97d503d26ecdb0e6e11041983660fef1f1998de1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 11:59:50 2011 +0100

    More execvp fallout

commit 237d45c8be3965cbadd8fa63ac9dc7c66fe5feb6
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.

commit ac755733328cebdb4f85c36901ff59b3219931d7
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.

commit e5625f9b826a526690e72bdaee82287752204d98
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.

commit e5cee9f15cfe4e57e9e543032197d0ca5a49331a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 10 09:52:19 2011 +0100

    s/s.getuid()/os.getuid()/

commit b5e7045f4ec44ad7d05f2078a89e9f8b058260b9
Merge: 75fa93b d408445
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 656570c6588101c6afa229f9c0357564c71a327a
Merge: ec9a6ba d408445
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 15:23:13 2011 +0900

    merged to trunk rev781

commit ec9a6babf363e58fa4c0661efb81db43eaff8eaf
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 15:16:03 2011 +0900

    fix pep8 check

commit 75fa93be6f7fdb01a045d9e024137613d4d3fa73
Merge: 4e1ea44 2f33c4c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 10 00:49:06 2011 -0500

    merge lp:nova

commit d4084456c945a756c648270f37cc17fd2e7dcbe8
Merge: 2f33c4c 8424fd4
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 4e1ea4438a7d7f2868c0198c7c7cf3ec23b21629
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

commit 2f33c4ca9a80e8ed3df488a5632cc7f9b94b2541
Merge: a5f9721 8cc1833
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 8424fd4169daf92ba44d423da06f003903c66e55
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 05:02:24 2011 +0000

    minor fixes from review

commit a33b1c2f07d1b2c29f0da416f8fa8d4405b918a2
Merge: edd4259 a5f9721
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Mar 10 04:42:11 2011 +0000

    merged trunk

commit fd4038db7111454618112a31446236c4b151e4f2
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 10 13:30:52 2011 +0900

    fixed based on reviewer's comment.

commit d68ba832454a3ee82b382f9847c51df4ed7f1dfc
Merge: 56a9bb2 a5f9721
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 22:04:29 2011 -0500

    merge lp:nova

commit 631f11989558f56dca34f87a2d31a7dcd3f53dfe
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

commit 3a62744f83881cb779de346af3acb0a90fef7283
Merge: 9e74dd4 a5f9721
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 9 21:33:01 2011 -0500

    Merged trunk

commit c6127d70ef32e5681a9da4a384ccec34f6784eaa
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()

commit a5f9721f6359d1ba2637eea6f95bc8a6cd96da2b
Merge: fa4eeff df8da33
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 005e2183e1ee62748d28d45a4005f1cd0db4fae3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 9 14:54:57 2011 -0800

    maybe a int instead ?

commit 56a9bb2afdce25e985751a29a7a63b9ca66dc812
Merge: 46336d2 fa4eeff
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 17:46:54 2011 -0500

    merge lp:nova

commit 46336d2f18d38c00d73bdbaebe319a21015cdd03
Merge: 063bb42 9417299
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 fa4eeff0097170db9816487bc995f7f3a5e8ae11
Merge: 9417299 27f1114
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 22:39:57 2011 +0000

    Fixes doc build after execvp patch.

commit c55c25d08cc0fe5456ac485b287d33ede5cc72a0
Merge: 140acfc 9417299
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Mar 9 23:39:12 2011 +0100

    Merge trunk

commit 27f11140d55409062c4427f455411dc125c04133
Merge: c08ab51 9417299
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:23:52 2011 -0500

    Merge main

commit c08ab51f2716b61dc0ec038aa721a2e5990c2bb9
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:22:54 2011 -0500

    execvp: fix docs

commit f447f9ab8b0bc586ffe53d82bbb8e5c4a13d001e
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)

commit 94172998ad9e4dba57727ebfad584a9aa8e937f0
Merge: 1888edf 747f34a
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 760442efc54dd6b79014cedf80266996795beea2
Merge: a2a1978 1888edf
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 17:05:19 2011 -0500

    Merge with main

commit 1888edf13ddbf1cfad3750529aa05d2ba4b47c78
Merge: b875850 a2a1978
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 063bb42d4e1ef8c9b52af93816b18b7374949af3
Merge: 816f075 b875850
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 16:51:05 2011 -0500

    merge lp:nova, fix conflicts, fix tests

commit e288a636505e765004faf169204014d63ab2910c
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 21:46:27 2011 +0000

    fix the copyright notice in migration

commit a2a19788b650c07e1fa58938366d80cbdbe9bf16
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 16:44:48 2011 -0500

    execvp: cleanup.

commit df8da330c2005944a85d486e79631b933df85ce0
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

commit 816f0752b63cc9ed31d5f700f4f097ec2a7a18fc
Merge: 69d201e 8504608
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 16:32:06 2011 -0500

    merge lp:nova and resolve conflicts

commit b875850bbc170d52421604a062e73e6ef7e389b4
Merge: 61257ee 292ed87
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 61257ee5614a681e8699026dd3d7f0e9de5d3b57
Merge: 8504608 6682329
Author: Dan Prince <dan.prince@rackspace.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 833e8e6ae694cba8a6b8a4aeeb0d9f28f1a6ca9d
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 9 14:55:36 2011 -0600

    Added naming scheme comment

commit 16f142fb35e99de78b0e53c4ea6c075d0b3e61bb
Merge: 57167f3 8504608
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 9 14:42:50 2011 -0600

    Merged trunk

commit a0675e846f52d468f41873027090a38dd0aa4d00
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 15:33:20 2011 -0500

    execvp passes pep8

commit 0204dad834ef597a7dad45730c640f1ac8843f2a
Merge: 55b0360 8504608
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 20:14:12 2011 +0000

    merge trunk

commit 850460871f77bcc553c85bbb05c6b86c74bce38d
Merge: 7b7aaf6 0e124a4
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 747f34a7d59b4820d06a49f337f8f6345b6c02f5
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

commit 69d201e475eb47d03855320e994ed00737b11119
Merge: f7d0c1a 7b7aaf6
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 15:07:38 2011 -0500

    merge lp:nova

commit 7b7aaf6367994568f28c37fbb593bfec93798bfb
Merge: 05a7d92 8d6e502
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 66823290f884eaeee37bd2bc6a63d81c1953c551
Author: Dan Prince <dan.prince@rackspace.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.

commit f4dbe9f55cc8d4cd43a4dce70efaad2a387c8ac3
Merge: 26033ee 05a7d92
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 9 13:47:21 2011 -0600

    Merge from trunk

commit 26033ee9f73ba726d527714c923882fd6c6ab442
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 9 13:46:05 2011 -0600

    stuff

commit f7d0c1ace4b25f0e67c682fe741bd8e0c5b67446
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:38:34 2011 -0500

    rearrange functions and add docstrings

commit 1d668fa0633dd79371f410bdc94d1337572f6671
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 14:31:23 2011 -0500

    Fixes uses of process_input

commit 48353d14201945f4ffa208f0ffdab8f779a95df7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:21:18 2011 -0500

    update authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 046b26feb76fe4a4ec70cfc5afb651b1e2e10012
Merge: 84d32f0 05a7d92
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Mar 9 14:20:26 2011 -0500

    merged trunk r771

commit 0039a2965e17b05e3738d76635655df957230dfa
Merge: 81f5058 05a7d92
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:13:35 2011 -0500

    merge lp:nova

commit 81f505803466eb9c74a9bb1842f88b295c701cef
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 14:07:33 2011 -0500

    remove unneeded stubs

commit 9e74dd46448621aa7332b46d682bab0bb34e786e
Merge: ca50f05 05a7d92
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 9 14:03:00 2011 -0500

    Merge trunk

commit 3be94a60419d36c884d094cab31e877e7023660c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 13:54:30 2011 -0500

    move my tests into their own testcase

commit 05a7d92ab2b96f613f6ef13d30fe6870c36cdcf2
Merge: e60bcef e687450
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 292ed87857604fab7a83f7b403f0c3d6a7b6b1fc
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 19:16:26 2011 +0100

    Fixed pep8 issues

commit 09c07cde46ffa8ae114eaf7415c62ad43a6fe315
Merge: f51ebbf e60bcef
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Mar 9 18:13:59 2011 +0000

    remerge trunk

commit f51ebbf497f165565311e29ca2dcf1b883ea5f65
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.

commit 984c919b37ba3c2c02922bd9543b732268bdd146
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 19:03:58 2011 +0100

    fixed lp715427

commit 8c1e118c7f1d9742a34f67ee7dc759438bd04f94
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Mar 9 18:57:53 2011 +0100

    fixed lp715427

commit 8f042590bbbf4e4921d9c410c23518d5e9340c4d
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 9 12:32:15 2011 -0500

    Fix spacing.

commit 1b42aab83e7a1f4ecded1b8438ac7b026541980a
Merge: 472053e e60bcef
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 12:14:35 2011 -0500

    merge lp:nova and resolve conflicts

commit 472053e0cbd17a3c13179f47564e9e4dcf79294e
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 9 12:03:17 2011 -0500

    remove superfluous trailing blank line

commit c68d7801210bbe94fd9f499f9c90381dae6d7971
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

commit 832f4bc8ec4fd92769499a9d2ec7d5c54a72b28b
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 9 10:37:21 2011 -0500

    Added 'adminPass' to the serialization_metadata.

commit eaba1b38c0312aa74039e0c7a78771b00d9a63b8
Merge: 0d4f57f e60bcef
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Mar 9 09:21:19 2011 -0500

    Merge w/ trunk.

commit 55b0360bd787c3cb534449c14026fc6ba577f715
Merge: aab4e91 e60bcef
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 13:48:21 2011 +0000

    merge trunk

commit b818fbcb427b03ec97309afc6c93ed3f292d14d1
Merge: 975a4e7 e60bcef
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 975a4e7ee6b7e7349ebfc55d74325c5dd67f073e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 9 11:17:41 2011 +0000

    Fixed pep8 violation in glance plugin

commit bb80ce56550cb76073361bc06108cba8b88c32ba
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

commit 0e124a45bdf2682ce19912e97108e2a496b5bff0
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.

commit 453ccd1e7b3a6b6d0d4ce1a0191dee5f9e90b5c3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 07:35:58 2011 +0000

    make static method for testing without initializing libvirt

commit 22ac9beb7de2cddce6fa52af5429298115cb5558
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Mar 9 06:56:42 2011 +0000

    tests and semaphore fix for image caching

commit e1cb190d84fab4f98f43e1ca92deac9e763faf50
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 01:26:53 2011 -0500

    execvp: unit tests pass

commit 2e11fd3649f829724d735f13508de4d660b79da3
Merge: 2bb5460 7375ad6
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Mar 9 15:26:16 2011 +0900

    merged to trunk rev 769

commit d91482acf645937b1ee97b30ae20685d9b6a3f62
Merge: bd469be e60bcef
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 00:33:35 2011 -0500

    Merge with main

commit bd469be4dea7872ce318d416e9e74c34a3d9bb97
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Wed Mar 9 00:30:05 2011 -0500

    execvp: almost passes tests

commit e60bcef3fb5f8931406074fcdbe1871d5624f0fa
Merge: 7375ad6 c569a37
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 c569a37decb2de1cddac0d89a3550dd041701a73
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:51:05 2011 -0800

    Added documentation about needed flags

commit aab4e9112d33f997f453f0a23a11355b4002b91c
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 00:49:56 2011 +0000

    a few fixes for the tests

commit a0f7a9e0e949b0f069ab45d1de0dc1dbacf19ef9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:47:43 2011 -0800

    Renamed FLAG.paste_config -> FLAG.api_paste_config

commit 9c00a16feab5a2306be8f9f3945e441baef6f928
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Mar 8 16:45:20 2011 -0800

    Sorted imports correctly

commit 8bd3638d46b2ba090d3886c49b22679c22151f1d
Merge: f4a4f01 7375ad6
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Mar 9 00:38:37 2011 +0000

    merge trunk

commit 7375ad6b0287c612a2b83e75f8668137615882a3
Merge: c10072e fc1c7e2
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 c10072ee79259acbd3be921019177f131f70ed5d
Merge: 352eceb 0fefdaa
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 34bb800fd41f53bf6cf4576d735883dbfda55a41
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)

commit 0fefdaabefda38d2abf9a9e155924d3dfcfe044d
Merge: 1e8f20d 352eceb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 23:27:03 2011 +0000

    Merging trunk

commit 1e8f20d4254bf1e5d1b9533f50bc171198ea041f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Mar 8 23:26:33 2011 +0000

    Fixing tests

commit fc1c7e2d69cf89ebf378f21853300a5b7eb54630
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 8 23:24:19 2011 +0000

    Pep8 fixes

commit f87b575a97cda35a6010243fd936a6c422733916
Author: matt.dietz@rackspace.com <>
Date:   Tue Mar 8 23:17:50 2011 +0000

    Accidentally left some bad data around

commit 352eceb119010e271825d4d125fac481043f2158
Merge: 57167f3 e4b976d
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 7247a6adf854931d000cb68a0b8a99215e3cbda0
Merge: e9f154d 57167f3
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 bfad73aa5be527d20e064b923b626930f2e72765
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

commit a455d53e53e671dc2bf05bf889827806406dd04d
Merge: 4bebbe5 57167f3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 8 14:42:07 2011 -0600

    Merge from trunk

commit 8c437744b568a65953ee476b65ebe01990e23b37
Merge: 4733455 57167f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 12:39:58 2011 -0800

    merged trunk

commit edd4259026059050c56a407d146e89784523a973
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 20:28:11 2011 +0000

    update manpage

commit 87f2431069b1ee8755199ebb45e52f7c2f5bcc2b
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

commit afaeadc166fe05de41c12d815d0a64728e21299f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Mar 8 20:24:48 2011 +0000

    modify nova manage doc

commit 4bebbe5ab9ac37819d2be0bfde4194513e4c5d70
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Mar 8 14:24:01 2011 -0600

    Nits

commit 6a2adb9c2b0fd67bee007d80a43cba348b9900b2
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

commit 7fe8aad405880fe54de7251f6156ce19edba75cb
Merge: 6969eab 57167f3
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Mar 8 18:29:37 2011 +0000

    Remerged trunk. fixed conflict

commit 4bd15b6ea210309c5d6f197ce5f65c2234219351
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.

commit ec327598e7f93c975db27d8ca92a36582434f3f6
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

commit 6969eab232fb067acd79d44f332b40fd47196ee7
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Tue Mar 8 17:18:13 2011 +0000

    Remove addition of account to service url.

commit 57167f3214eae5432089b19389af069821fd92a8
Merge: 3779a8d 2ffd299
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 3779a8d65b639f49dd062fcf3e686bed769dd3c2
Merge: 71ece49 71a738a
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 f4a4f0140898ca747d6e71a07b7913f2e5aa408d
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 8 14:35:53 2011 +0000

     * pep8 cleanups in migrations
     * a few bugfixes

commit bd02ada13feae58922ba9bae3cbc5478dd69f49b
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Tue Mar 8 16:33:49 2011 +0530

    Removed stale references to XenAPI.

commit d004447f7df853b9645f04f5648c4ef950cc4112
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 -------------------------------------------------
 1 files changed, 0 insertions(+), 344 deletions(-)

commit 50078ad7c9695c26fb59784e0e7cff26c574ef91
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 10:09:34 2011 +0000

    Removed excess comment lines

commit 011005df4f8913f5deb184f51cdbe5d6ecd1519a
Merge: 8de6ad2 71ece49
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 8 09:48:00 2011 +0000

    Merge trunk

commit d939629f99e42e378885fbe5a8f3f300501108bc
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:08:13 2011 -0500

    Fix todo comment

commit 88326f9d579402a566533ef281d32727593bef38
Merge: 6d13b7d 71ece49
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:04:21 2011 -0500

    Merge from main branch

commit 6d13b7defca9d6891f67aa7c0ac9b4306091628d
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Tue Mar 8 01:01:41 2011 -0500

    execvp

commit ca50f05e96a223a5adbc8cc7f92bab23fa85cf72
Merge: effafb5 71ece49
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Mon Mar 7 21:42:00 2011 -0500

    Merged trunk

commit 2ffd29939814ee6f983fdb9e0edff022bb96d6a7
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

commit 0754df0bf18748159cc82c7dfe3a91312d81bad2
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

commit 8cc1833370697f600d0db92cd31c785b4274bc11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 16:01:43 2011 -0800

    add a delay before grabbing zipfile

commit 6367c37f6381a4132248a5e2d696dad80dbef5fc
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 23:51:20 2011 +0000

    Some more refactoring and a tighter unit test

commit 9bcf95e0cd0a53bb2e530a0c6b109ecc964bf422
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

commit bfdfd4972537fec7c99706fe72859f31475eb5f9
Merge: 6238d26 71ece49
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 15:30:58 2011 -0800

    Merged with trunk and fixed conflict.  Sigh.

commit 6238d26800a9edfe910c6e88afd59c8beabde864
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 15:22:59 2011 -0800

    Converted tabs to spaces in bin/nova-api

commit 4ee6227136b8f06e75f5225f9e427ac45e66c641
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 23:07:05 2011 +0000

    A few more changes

commit 71ece499f26613e9031efba6593c6b3a750325d5
Merge: 3996649 ee6e2e5
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 3996649759023dbe8829efa6c2da8b65d1b7b913
Merge: 96ce788 6632bd4
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 cb958445b04e078a99ef6ab3f69c0cc36073dd37
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 22:50:35 2011 +0000

    And unit tests

commit 8cbf7a267e0d84b581bffa92f419d38adb404dde
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 14:42:36 2011 -0800

    A few formatting niceties

commit 109f891bbf0ddfbbe328675756860b9f16f86938
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Mar 7 16:40:19 2011 -0600

    First part of the bug fix

commit 5a98c52c40dfb0ae4ff4e89a16ad2544b29737b2
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

commit 08c6346d66fa5109b5170d64c60b2153d34d777e
Merge: 859a447 96ce788
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Mar 7 14:34:02 2011 -0800

    Merge with trunk, resolve conflicts and refactor

commit 4a0220028e5e2d05f6c9c5f0c0838548331e07eb
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

commit f2d88eb53b4b0eee117fee539118d5538ae5e267
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

commit cdae36747d5dd50fb2431a01964b8be1e3b37784
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Mar 7 22:37:26 2011 +0100

    deleted network_is_associated from nova.db api

commit 986ab021a198c44e15cdd7bbb73d1ed43e0c7022
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

commit 5cf496943d38bf127eed01705534e7c1414579c4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 21:22:06 2011 +0000

    pep8

commit 94a8eec4c8fa2b1ac9a2efbfdcbf61e5cf7ea97b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Mar 7 21:20:32 2011 +0000

    rework register commands based on review

commit 8659e0aa561cf46455d9e9fab2586815522e8c96
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

commit 140acfc0914cb672c7249ef075c174c3ce02ea8d
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.

commit 9b8ad406e3dcc7e48893fb4f66a0d7fa94f17cd1
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.

commit 1acb2d43fddc0cc670c3c113bf651fdca98a8165
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__.

commit 8d6e50286bd7cf16a843192cab55704d7a441611
Merge: 1cbeead 96ce788
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Mar 7 15:26:35 2011 -0500

    Merge from trunk.

commit 1cbeead2fc89c5f739150128d16a85cb4ed2edb9
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.

commit 6632bd4db229bd4ec9baadf97d0d398c40de3132
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

 etc/api-paste.ini |   91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 etc/nova-api.conf |   91 -----------------------------------------------------
 2 files changed, 91 insertions(+), 91 deletions(-)

commit 96ce7889dc74799e274b504843fce6f9ffe59de7
Merge: 4b3a81a 792429d
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 792429dacdaffd9b3b235104f08541febce32cb3
Merge: a39b03a 4b3a81a
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 17:18:10 2011 +0000

    Merge from trunk

commit a39b03adf83816f773880776bda4df75d853b38f
Author: matt.dietz@rackspace.com <>
Date:   Mon Mar 7 17:17:41 2011 +0000

    Merge prop changes and test fixes

commit 0d4f57f703b213f177533611779f79618dc72621
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Mar 7 12:07:23 2011 -0500

    Generate 'adminPass' and call set_password when creating servers.

commit e9f154d447281927d9b2fc9353e3c9859c7a7d9f
Merge: 63ab6bb 4b3a81a
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 58887200e030b81fd0782937bb9cc4849d9bf7e1
Merge: 51b9360 4b3a81a
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Mar 7 15:53:54 2011 +0000

    merge trunk

commit a00ca87454597622c79d67a5add0574ca541e81d
Merge: b20ed55 3b1053c
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 002e03adbfb07ca9fb89ec43a8c29bf6bd1e5051
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Mar 7 15:12:26 2011 +0100

    Make "dhcpbridge init" output correctly formatted leases information.

commit 3b1053c9967212b4928352e670eb4d9be9cf2cd3
Merge: 5db9e23 4b3a81a
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 19:05:48 2011 +0530

    Rebased to nova revision 761

commit b20ed5537bf555980ccee46c729f5abeb88f0b3d
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Mon Mar 7 18:38:04 2011 +0530

    Fixed some more pep8 errors

commit 5c037d33abbe3544544dddc148b0459f9d03942a
Merge: 96c45fd 4b3a81a
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 89a37d3dc7d57f3882676c2653964e75f7f47d6e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Mar 6 19:21:14 2011 -0800

    zipfile needs to be extracted after nova is running

commit 74186c89f64d3d4d62c141ed3dd7f1350b6a6c97
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

commit fa3d0debdf62550bd5d781d418ba2206f1f1d380
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 12:06:39 2011 -0500

    avoid possible string/int comparison problems

commit 17bc4618a955d0adf31b720cf2d8d50d8297f02b
Merge: 0610e85 4b3a81a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 10:53:42 2011 -0500

    merge lp:nova

commit 0610e85a609f3345d494a5c71fc6ffe897dd07ed
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Sun Mar 6 10:41:24 2011 -0500

    select cleanups

commit 71a738a7283de7b272cc4160542f9756b5023b16
Merge: 1deabb4 4b3a81a
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 4b3a81a6fe275cdcfe015e602d66fe012fef1525
Merge: 56658ca 65e68a1
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 175acd8001a91ba8417314925e1f9d2cde2320b6
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 4 19:13:27 2011 -0500

    apirequest -> apireq.

commit 51b93602d1954e92533e458c7ac7cf311fcd32ac
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 4 22:17:53 2011 +0000

     * os_type is no longer `not null`

commit 70e7d22e1f266f6c3e25465e28d39b5a1de81d85
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 17:04:41 2011 -0500

    respond well if personality attribute is incomplete

commit 20caa1a925ec6a81ce4a1b68e910386c7f6d1819
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Mar 4 21:07:03 2011 +0100

    Added initial support to delete networks nova-manage

commit d143d166d75ed15ec9a8c3d4df24b6a516ccd356
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

commit 1445a76121e020dcd4d1254060e129ca98fe1f98
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

commit 24f9695505f02599a2434203cc6bd17235437373
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

commit 1033752163bc2d7cd58084b3f5caaeb8e8367a6a
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

commit ab1102ca90cf4feb867637a04bd7541d52c88520
Author: matt.dietz@rackspace.com <>
Date:   Fri Mar 4 19:24:55 2011 +0000

    More unit tests and rabbit hooks

commit 65e68a1b9b22d3cce7764be4249273488f4793d7
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Mar 4 14:01:25 2011 -0500

    Fix renaming of instance fields using update_instance method.

commit 584d2ac43a285be38ef0e2adadc5117172da0177
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.

commit eb020a6fc3d905934a91f2e8871f111a8c208652
Merge: 8b39ac9 56658ca
Author: Cory Wright <corywright@gmail.com>
Date:   Fri Mar 4 17:59:28 2011 +0000

    merged trunk

commit 8b39ac97458f0750cb58849b7deae550070e7375
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

commit f50a34a1dc06deb44fd6284293158b88bb313e02
Merge: ee63242 56658ca
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 4 11:20:28 2011 -0600

    Merge from trunk

commit ee63242261aea339737d53a3fc4e23c68676dbc5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Mar 4 11:19:35 2011 -0600

    More fixes

commit d16185752dfc02e3f381448f1fddd17a8fc850f2
Merge: 80cbf0d 56658ca
Author: matt.dietz@rackspace.com <>
Date:   Fri Mar 4 16:53:50 2011 +0000

    Merge from trunk

commit 2bb5460e93ce9ad9668d0a67ee943c4568e2a6b6
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Sat Mar 5 01:07:12 2011 +0900

    delete unnecessary DECLARE

commit d4e0430e6cd8faf08c111f42e2db50f755a6bb57
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.

commit d301ae3c97502ad461019ed9f965aea993295bcc
Merge: db4d549 56658ca
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 10:36:54 2011 -0500

    merge lp:nova

commit 8de6ad2c7496c9a7f4650f2e16a7367551f66e62
Merge: aaf4795 56658ca
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 4 12:43:33 2011 +0000

    merge trunk

commit aaf4795e1551787ad71b48199e2e6dc20826229a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Mar 4 12:31:59 2011 +0000

    fixed wrong local variable name in vmops

commit 56658cad64e09265bf39d659b43f8db1cda8d7cb
Merge: eb351d7 26dde09
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 db4d5497eece213b8be65bceb248b15ab663b162
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Fri Mar 4 01:36:29 2011 -0500

    remove ensure_b64_encoding

commit 2162f4da89a7c827f4b70993ea740aa31df46493
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:58:49 2011 +0000

    add the ec2utils file i forgot

commit bc315f163930d2574882336992b95ce24aad910e
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

commit 88f5e0dcde16a2abdf08762363059e4d50fe871e
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

commit 6ab087fd074a3bb72251aed107c75af532b720ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 05:04:49 2011 +0000

    make local image service work

commit fad0bbd1bc4ad07746b594609528882e1336488c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Mar 4 02:49:12 2011 +0000

    use LocalImageServiceByDefault

commit c8c33099046e9fefbbbf4b2f18139336b63604f2
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

commit 1deabb499629861613bb49a97ef88700eb138318
Merge: 141ed7b eb351d7
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 10:47:17 2011 +0900

    Merged to trunk rev 759.

commit 141ed7b90b420c59092aacce29f7a7f2984dd089
Merge: 66db446 f71908d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 10:46:55 2011 +0900

    Merged trunk rev 758.

commit c41658ce6374b4f4576f8c09d32bac6ecd811b64
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

commit fca1e9d1677eb3a5b51735088221a1b2cbe718f8
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

commit c95067ace09f37820c997c51ac726e5a3721f507
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 15:39:23 2011 -0800

    altered ra_server name to gateway_v6

commit d743d2f85852a4c34ef3ae3325caa88aad63da63
Merge: adecf9e eb351d7
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 18:34:06 2011 -0500

    merge lp:nova

commit adecf9e162124cdb305f5bd9b05e1f20b01e8dd0
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

commit b175c4631b54776423a5f2d75fdda27a7fdf79ac
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

commit 705d6912d286f692cea4a1ca5b2249c634d05dc1
Merge: 4db0eb5 1aed2ba
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Mar 3 23:04:11 2011 +0000

    Merge from trunk

commit 28a281e0e3cec9761bd95fffef691e4e3082f3bb
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 17:49:41 2011 -0500

    enforce personality quotas

commit 409a0c321baa24256ad0cd3798ed7ebd99a4c2e3
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 22:22:00 2011 +0000

    localize a few error messages.

commit 84d32f00fdcd4154bc5a6233d0c88eaa060988a8
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

commit 1107b33a03539eff61dcdea5f2a7ada2810e108a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Thu Mar 3 16:31:01 2011 -0500

    pep8

commit cc3ae4c6a4dc8e20fa8168678bcd3777e2fc537d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 3 13:18:37 2011 -0600

    Renaming my migration yet again

commit a0fe3dd1d60f513a8736559d481255a0fe778789
Merge: a52ca61 eb351d7
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 7a380d019f0512b415249f0dfb20432131afa103
Merge: 79b6506 eb351d7
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Mar 3 11:09:24 2011 -0800

    Merged with Trunk

commit 26dde09e0d0b1725c4f04d85f8f3717fae64eef2
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

commit 80cbf0d505a9c44db840c0a86de7006bac4392b7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Mar 3 11:56:21 2011 -0600

    Basic notifications drivers and tests

commit 6e7789033b682fd8c703e677140742ab0f3dfc30
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

commit eb351d70c08eb877a279b2d3f9715c57da51ad1d
Merge: f71908d cce8402
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 90f39c62a5b2bdc84f848d216e688ab18200e7b5
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Mar 4 01:17:05 2011 +0900

    some comments are modified

commit 4ac5ddd83624df1b56de02fbd768095128500b66
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.

commit 2bc8eaf155fa80f49111062f5f19295e4dc8d023
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

commit 5a5ff0daa48b8f5b217162f2c455304b325da72b
Merge: d2211d2 f71908d
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 15:50:34 2011 +0000

    Remerged trunk, fixed a few conflicts.

commit d2211d2f59929ad3bc745fa8a25135b6bb151b8f
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Mar 3 15:41:45 2011 +0000

    Add in multi-tenant support in openstack api.

commit cce8402e8341fc2c565bbe26ab98ff2b550b7f4c
Merge: 2dcc71c f71908d
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Fri Mar 4 00:33:29 2011 +0900

    Merged to trunk rev 758.

commit b06e1465af326c1333608da5b75a08895a8335e4
Merge: b4f0361 f71908d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 16:33:18 2011 +0100

    Merge trunk

commit f71908df210e5e976c2e9319550834797adc950b
Merge: 6da8d9a 36d8152
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 2dcc71cc970b5ff117805ab2fb0c48adb7646301
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

commit b75361e4ab0a6aaacd68bd6c734b4d1c3c2b8752
Merge: bbe10f6 6da8d9a
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Mar 3 22:57:30 2011 +0900

    merged to trunk rev757

commit bbe10f62efe3adc320cd8b72a2a1bfc83fdf6173
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.

commit 36d8152f5570608aa32216bdd475ce4e41e8fbae
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

commit b4f03613c2bf4fb2c628de5aa2ffeac095df2480
Merge: 2ba62a1 b5cc02e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 13:52:09 2011 +0100

    Merge sync branch and trunk

commit b5cc02e4e638e8f522aab40767e0bba9a647ea35
Merge: 6085b6f 6da8d9a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Mar 3 13:51:36 2011 +0100

    Merge trunk

commit 6f1d74d1978763d55503a680368b2a6c77f9e9c6
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

commit d204b5f617fb13b4e92d6e202b211066c5931014
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(+), 0 deletions(-)

commit 48c9bf60f71778316d5f680e3b49a2ba8ce5b937
Merge: f03df43 6da8d9a
Author: Masanori Itoh <itoumsn@nttdata.co.jp>
Date:   Thu Mar 3 13:54:12 2011 +0900

    Merged to rev 757.

commit 6da8d9ab156829f6a2fea2302d11b294176c68c2
Merge: 2f9a193 368a4d3
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 368a4d368759b3694a44a3988c3a65a9fae5931e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:54:04 2011 -0800

    moved migration to 008 (sigh)

commit ed4b4887df602ee73c5dbfad4e6e8bee46c0a359
Merge: 68a40fc 2f9a193
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:50:48 2011 -0800

    merged trunk

commit 68a40fc411320162e82f03bcc8aead32a063c8c5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 17:38:42 2011 -0800

    catching bare except:

commit c5e5b7b1e0447ff7e73790b5a0215740819d7af7
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

commit 2f9a1930d8d73cee89b53f63a0b4579d6e6f7bc7
Merge: 761aa13 01343c3
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 9504d850503859449c3dca898d4c461534515b98
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:59:38 2011 -0800

    requested style change

commit 761aa1392517268def0942b645f5706b1d7186a5
Merge: 788c96d 287280e
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 dee964780540002110f3afc0c3658d76a12dfb53
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:57:56 2011 -0800

    adding new source docs

commit 729ae0c5590b9089816a473ca09b27a2649922d2
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:46:32 2011 -0800

    corrected error message

commit e818c5a53a39c369cf006ccc7bb308d371631259
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:37:02 2011 -0800

    changed _context

commit 711b7af259fa6d0d7243fad128df57348d89ba1c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:35:53 2011 -0800

    pep8

commit d39e25b4b704b563f5eaf9e3892c0470d9e06942
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:32:09 2011 -0800

    added in req.environ for context

commit 59d2a60fb6a1dce7b9311d98c40ebb0b2f166fcd
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:12:36 2011 -0800

    pep8

commit 488da81044aebc2992252397c2357914ca74735f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:12:22 2011 -0800

    fixed _context typo

commit 1764bae7effa1175e60d57b63e2b82cec77f6ad9
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:09:27 2011 -0800

    coding style change per devcamcar review

commit 0efa4b2988af72244defc88af106eca6d8810e4f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Mar 2 16:07:05 2011 -0800

    fixed coding style per devcamcar review notes

commit d1534281a54d70def4ac06a0705abb9d52078e6a
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

commit 788c96dc9dc0db3c9b2ee322b378314530510262
Merge: 78d9f0c adbc19e
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 78d9f0ce1c66c01bcdf8e9e3e8362491fee8133d
Merge: 1d663d3 c4d39ac
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 adbc19e090ae23e0a483a5d298e63258f962c71f
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 17:09:50 2011 -0600

    Updated docstrings

commit 68f5eca3ab97ccdfcf5906667de344a16b47cd1c
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Wed Mar 2 17:36:21 2011 -0500

    add support for quotas on file injection

commit c4d39ace4257dac907d4badbb6f1b662ef68a08b
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 16:20:54 2011 -0600

    Added IPv6 migrations

commit a52ca61e098435fcc81a9bb6dc7f0a971e3a639e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 2 15:46:50 2011 -0600

    merge fixes

commit 4335bd7d0c98bc45a74c44b96dd5f91a242f5bb5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Mar 2 15:42:21 2011 -0600

    Inject IPv6 data into XenStore for instance

commit bda8529705fe5ee1146ae62ee285b8d560e223af
Merge: fae43c2 1d663d3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Mar 2 11:39:30 2011 -0600

    Merge from trunk

commit effafb5ef66284f06315fb8e06d6ff0487a0789e
Merge: 9f15683 1d663d3
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Wed Mar 2 10:55:12 2011 -0500

    Merge trunk

commit f03df43a0bfc7ea5870122296483464b5419b72e
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.

commit 66db4465b9a84aefbb2946d592cd5de2a963cc03
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.

commit 63ab6bb54a3ff46fdc40d79b55e7886526c9905b
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.

commit be0ad31e8850641b5d902bbfad53efcdf0a015e3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Mar 2 09:50:44 2011 +0000

    Removed excess TODO comments and debug line

commit 2024aea047c23b3cfcbb092aed8474a6210bac19
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Mar 2 01:21:54 2011 -0800

    initial commit of vnc support

 tools/euca-get-vnc-console |  163 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 163 insertions(+), 0 deletions(-)

commit 60b7133f25978cd1d0f625317c49101af1f54516
Merge: 49bc949 1d663d3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 1 23:10:04 2011 -0800

    merged trunk

commit 79b650672fd015317cfadff13df061ee1a0ae568
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

commit ce62583c9342047b0ac0c8e0a608c0921faa00f0
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

commit 37421a98be952cae0123ec72ee7274148c8026cb
Merge: 9396d3f 1d663d3
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Mar 1 23:22:33 2011 +0000

    merging trunk

commit 9396d3f4434289995e1ae2095383db4eff80d252
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.

commit 0521359c78485699fc7c381e94b8ed0cbaf6b33a
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 16:48:01 2011 -0500

    test osapi server create with multiple personalities

commit aa4b4957b91feb2c3c1df3b7c671dc5905108d81
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 16:21:37 2011 -0500

    ensure personality contents are b64 encoded

commit 01343c30e620622a3c95c63e33d8ba74b7f931c7
Merge: 440451a 1d663d3
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Tue Mar 1 15:58:36 2011 -0500

    Merged trunk

commit 287280e62349ef50d388e89d5dc6f8a466c327bd
Merge: e180095 1d663d3
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Mar 1 21:58:28 2011 +0100

    Fixed pep8 issues, applied jaypipes suggestion

commit 2ba62a15e0a77413a30f26d66d8804bb10eb1250
Merge: 10c42e9 6085b6f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Mar 1 20:54:51 2011 +0100

    Merge sync branch.

commit 96c45fd90f1fbfd429c1a94c0fe916d1fb2a7795
Merge: a6520c4 1d663d3
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 01:24:34 2011 +0530

    Rebased to nova revision 752.

commit 6085b6ff1fbe8a7074e6d43df89dbb4a9d02381b
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.

commit eef2e19dfa8d181cb2bdda2f1f4de65e6f721752
Merge: 5554c25 1d663d3
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 14:31:46 2011 -0500

    merge from trunk

commit a6520c4e928e674c976249863b1cf8213a9ed83a
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.

commit c92c47394bbcbcff7a1e6132215f8524f0939784
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 13:26:31 2011 -0600

    Review feedback

commit ef1560882d0baf9e32c4c96f7e2b885084ac7d8d
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.

commit 6c49002fe37de02a7d2be5f4268ea2befe6cf419
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.

commit dbbbaf875e7fd9e268dbd8e5a86329bff4ae6da3
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.

commit c0359d89c2afbe30f0df3c6dd0ccee8b9aa44947
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Wed Mar 2 00:37:55 2011 +0530

    Minor modification to document. Removed excess flags.

commit 0f1710df54b97d73c8180a6b464f79c632c7f47d
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 5554c2535ca366e76e03414b08e1e10f80191663
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Tue Mar 1 13:56:33 2011 -0500

    support adding a single personality in the osapi

commit 49bc949c80e643c53a0165e94ee580e3c42ec631
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Mar 1 10:40:56 2011 -0800

    corrected copyrights for new files

commit c4ebd0b7faa2a54d4e8dc69a333ca939b45c0c50
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.

commit c3c73db55d2209c833c4490b74320517984f422a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 10:55:13 2011 -0600

    Fixed trunk merge issues

commit 3a84b9f703332eb97ddb46b4a942ea8af5589d4a
Merge: 1a0ff7e 1d663d3
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Mar 1 10:53:19 2011 -0600

    Merged trunk

commit 0d95bd54287af2b2b46e3f039ce5e3de3e1d3e57
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.

commit 8b5f51f7cfbd1ada68c516531635b074536ddd4c
Merge: aa81f3b 1d663d3
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 18:45:09 2011 +0900

    merged to trunk rev 752

commit 5db9e23679fcb69a4e448721f371e0d78cd5b20c
Merge: 51afeaf 1d663d3
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Mar 1 09:44:58 2011 +0000

    Rebased at lp:nova 759

commit aa81f3b1aaa692ed223e13a316906ef1872570ea
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

commit a1b3db1fe28ae2aae381b3ab5398d9028801a58d
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Mar 1 17:52:46 2011 +0900

    rename db migration script

commit c73c401678fe5385ca1810798f481af747a61f6b
Merge: 2fae44b a1873e0
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 e71e7db6c9e79a303f616b2651a1bfcbc5c57111
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 18:33:33 2011 -0800

    updated docs

commit 4a619a20407f03579b7257845dd71fdd6eeb42fb
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 18:32:55 2011 -0800

    updated docs

commit 28b7e49429c2994af59e5aa2c76234f35ac0f6cf
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

commit 1d663d3584cd634cde14db075708ee4f80345194
Merge: 5a71c17 591d2f3
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 68ec817b1f9e2d3340e5680088cfbd1473df7c62
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 17:06:35 2011 -0800

    refactored adminclient

commit 591d2f399457357f9a9a3439efce4fedbb9e8cee
Author: Naveed Massjouni <naveedm9@gmail.com>
Date:   Mon Feb 28 19:56:46 2011 -0500

    No reason to initialize metadata twice.

commit 92e419a81878675db1e107df47f9591e07b3d4bd
Merge: 81e85c1 5a71c17
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 33029569086b137d60bb61246b312bfd84be8898
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

commit 934dcf2b388883bfa3b6f2de81cc6375d241a659
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

commit 6414f88b843b86f80a840023499f0569e4601d1b
Author: Mark Washenberger <mark.washenberger@rackspace.com>
Date:   Mon Feb 28 18:06:11 2011 -0500

    add test for instance creation without personalities

commit 3c8b090e566f4a98490fcfb475ffef37d9c691ee
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 15:05:50 2011 -0800

    fixed pep8

commit 10c42e9a4c8dbd2f37664d522d505870416f5525
Merge: 1e5a662 46ffbb9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 23:31:38 2011 +0100

    Merge lock_path change.

commit 46ffbb949e79d7a3d006381932d095ff096d9732
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 23:31:09 2011 +0100

    Add a lock_path flag for lock files.

commit fae43c2517edd69a8ae0c9399b5c3b47b28015c3
Merge: 7cf8d4e 5a71c17
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 15:42:54 2011 -0600

    Merge from trunk and mega conflict resolution

commit 648b81ed02ff3706997886bf8f0bac02446dd1dd
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

commit a0b3f16842fd063dda161960492ca07f2b9bdfd7
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:49:17 2011 -0800

    moved nova-manage flavors docs

commit 440451a523cd2592e0a59d121ae5a88ae9318090
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.

commit d7f42bd16d83e019ef691c0c238e97183a0b8db7
Merge: 6232ceb 5a71c17
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:44:17 2011 -0800

    merge trunk

commit 6232ceb7565a6bb7f2eb07eea197b08aae8222f1
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 28 11:29:52 2011 -0800

    moving nova-manage integration tests to smoke tests

commit 5a71c172f96875d9f44f3111b5d8519d58ccc3d5
Merge: fa996aa d368ad2
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.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 7cf8d4eadf64b236b9b9af6749f5ab2bb5e5d00d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 12:30:02 2011 -0600

    Merge review fixes

commit 63ac307c2a01bd7e5c12a5514fddeb15db32772e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 11:40:22 2011 -0600

    Rename migration to coincide with latest trunk changes

commit fa996aa82002bbc55fc6e3ca44bb966d238fc69a
Merge: a1873e0 a2da072
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 1979f44d0fd571d2bb414f77e21637e78cfa86f6
Merge: 100c588 a1873e0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 28 11:39:23 2011 -0600

    Merge from trunk and merge conflict resolution

commit ee6e2e558af111bf8d4a3e33533017f5504d9615
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Feb 28 17:27:19 2011 +0000

    Suppress stack traces unless --verbose is specified

commit d368ad233376dcabf447aa545f8ed7d4a04b650c
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Mon Feb 28 11:25:14 2011 -0600

    Removed extraneous newline

commit 81e85c1ba498babb0c9f8989c73b64b1fa967528
Merge: 56afd0c a1873e0
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 c2f5572fa9b2376ffcbe27dc93ccb7d6a7024360
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.

commit a2da072db0b9c9953bee8387964e0161ee4c9761
Merge: 0d35c2e a1873e0
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 28 16:25:01 2011 +0000

    Merging trunk

commit 1493eab03137e44445f35efe3b6de9d9f05d73ca
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

commit a1bd8854c40832b22c744e51aa77e1a2e22c577c
Merge: 9da0984 a1873e0
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 1e5a6625b96153841b192f610014ef8d6bca0a1f
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.

commit 974319e8da19f3952554c7e5eafb2c86d34abd4f
Merge: 8aab6b9 ea49eb6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 28 15:28:49 2011 +0100

    Merge sync branch.

commit d864ddb8918fe8249299332a81ec7105892d8950
Merge: 4a8d075 a1873e0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 28 12:22:02 2011 +0000

    merge trunk

commit ea49eb6dbb1ed180f8f571d39fe193af2a70d6e6
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.

commit 9e47816955366e64eabfa937ba25c237225e43ab
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:57:13 2011 -0500

    execvp

commit 7ad5d23700b85ed9454aec547b33db6f8a8a9e58
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:53:53 2011 -0500

    execvp

commit 03f27f0a24812301699072990efd75f9edd5a91d
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:52:32 2011 -0500

    execvp

commit 3a408ed7c265078ba470b48209ab7876b4980485
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Sun Feb 27 20:28:04 2011 -0500

    execute: shell=True removed.

commit 9f15683e6ea9f91ebdf91f430e76b74a62da4ac0
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:35:10 2011 -0500

    Add lxc to the libvirt tests

commit 7d065f0323afd852545707759909bcb8d9885be5
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:29:05 2011 -0500

    Clean up the mount points when it shutsdown

commit b45d685d6e6463136f26c7089eed12a54cc6aa82
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 13:05:26 2011 -0500

    Add ability to mount containers

commit ffe691d063a34a0434500ad120105727b00c30de
Author: Chuck Short <zulcss@ubuntu.com>
Date:   Sun Feb 27 12:51:19 2011 -0500

    Add lxc libvirt driver

commit 08149370577c04c715d2eaacb4952a2a7304a33e
Merge: c411338 a1873e0
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Sun Feb 27 08:07:24 2011 +0530

    Rebased to Nova revision 749.

commit e4d777e532ebdc0c810baf07e7c07b798e21e42d
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

commit 8caf65e4feab47f414c4d7258b90db03250794f2
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sun Feb 27 00:07:03 2011 +0100

    fixed FIXME

commit 62a05503938852c16ade4df3ac1d8b79876d2094
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 22:13:28 2011 +0100

    beautification...

commit a1873e0d176bb4a6668d9d3fcdf2d3004923569c
Merge: 0e1ff4e e748659
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 e74865915db194f884922bc989aff4cb1f5f41e2
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Sat Feb 26 19:19:02 2011 +0100

    renamed flag from maximum_... to max_...

commit e687450f9aed74a885008cc4640bcd4cf1176351
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)

commit 0e1ff4e5773283b0edcd9a657fef85dbb9032de5
Merge: a59d10f c737445
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 c737445ea7588b1c5060956b2bb0c07cdfe4ea8b
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, 0 insertions(+), 8226 deletions(-)

commit 087585210f611d984606cdf53e0dd2534892c3f6
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

commit a59d10f9f72e165c6e38cf27a8a7832179ed4b72
Merge: 4582919 bc271cf
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 4733455f77825d7b4b4094047976c4672d6fbe0b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 23:58:36 2011 -0800

    add timeout and retry for ssh

commit 458291919b611e722b34acd078cb40bd12081619
Merge: aab4765 a230f7f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Feb 26 01:19:39 2011 +0000

    Makes nova-api correctly load the default flagfile.

commit 2748a6b69946e781b7647dec9759ee8d38e1307c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 25 17:18:41 2011 -0800

    force memcache key to be str

commit 5aa1a5284889864888a17f377870797d6b3326a4
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Feb 25 16:41:48 2011 -0800

    only create auth connection if cache misses

commit aab47658725125c9d10650d020cd0fc85095aac2
Merge: 8b0bc22 3673f26
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 3673f260b34aac910081efe1def64f994d8fef09
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

commit c30f1be1024f76270ff485689f07cd213d07bf02
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

commit 9567c1101cda94188c16313fc7574f7ef65edbe4
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

commit 1a0ff7e1f65bf55888dd91c4d673ee72ec556012
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 16:18:11 2011 -0600

    Bootlock original instance during rescue

commit 443bd2d0c3854afbb1ec906c10f9ec918d9bc02a
Merge: b7245ca 44dc825
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:59:26 2011 -0800

    merge with zones2 fixes and trunk

commit 8b0bc22f4280c843b3d79c52641e0c41d9e26935
Merge: 4cb4e4d 15fead5
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 44dc825b0ac61ea2450eef2eefe56099635b31a0
Merge: 006dae3 e60bcef
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:42:37 2011 -0800

    trunk merge

commit 006dae3df485d6bd47213dfdf8d0745d99960ecc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 13:40:15 2011 -0800

    API changed to new style class

commit 85728e3cbbb4d86b961fe40b91eeaabd4fca1ff7
Merge: a09ac2a 6da8d9a
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 4cb4e4d6141f19523e5c9276b423f4ad3fd367d0
Merge: 48c5ced ac0f5b7
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 15fead52ab99cfeb62f3faeeba2682dcd8f877f1
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'

commit ac0f5b773e253a89f51c8f7c6da6e2166401c849
Merge: a18eb1a ff28147
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 13:02:12 2011 -0800

    merged trunk

commit fab077edcbd5cf24259d67d55c5e6dbafab62b1a
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

commit afd71cb403c05b86f55dbc3029927562230dc3da
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 14:47:25 2011 -0600

    Removed unnecessary compute import

commit 4de7c70b4fa10ab143bc1a476ae92c095c1ebfaf
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 14:35:29 2011 -0600

    Set rescue instance VIF device

commit a230f7f05a3cc0b595e124830ac36c36ed0b20b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 25 12:16:58 2011 -0800

    use default flagfile in nova-api

commit 48c5cedb17219bde3accd64cbae42f6b8a629c31
Merge: ff28147 553e855
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 553e8551f1d37dc95d4df2d3b9628148d1947c32
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

commit 15798965d0977a8d60bb876fa5cf0e4850eea01e
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ff281473d32556eb2cbf4c1b9234af07695bdf3c
Merge: 2718716 ab5d7e2
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 5e3f138a8caf0875e3f1c2a29d964df57c92249f
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

commit 7da38dd1a2a852daa83ab16d3eb06c1c8f1e1ff5
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 12:43:09 2011 -0600

    Teardown rescue instance

commit dd307c1e16bb03404eac9480dbe20667329b388d
Merge: 575c0fe 2718716
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 11:00:01 2011 -0600

    Merged trunk

commit 575c0fe6a970af1a9a225d99c942bbcaf2c5638d
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 25 10:54:37 2011 -0600

    Create rescue instance

commit 0d35c2e7ec6897b2e52bef204c5fa97a01791e91
Merge: 78d31c5 2718716
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 16:47:08 2011 +0000

    Merging trunk, conflicts fixed

commit 78d31c54d68930b1f0f01e261e2e05d34cc4cf12
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 16:24:51 2011 +0000

    Verify status of image is active

commit 51afeafd091428857066360967f11f009b5644c9
Merge: 107de37 2718716
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 a09ac2a1032428e2d852f043d4af47a0c3866c32
Merge: a457339 1d663d3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 25 05:12:28 2011 -0400

    merged with trunk

commit 2718716f2f0827db2e592c530c4bcca0e1aabaaf
Merge: 419a81a 593eb19
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 419a81a46ee784da0a8135398dc6224b49afede1
Merge: 4a4dbea f1c062e
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 ce25d3155111fbf384b4cfdc959742fbb755a9cc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 22:02:50 2011 -0800

    revert a few unnecessary changes to base.py

commit 1d0d3aa0eecdadd1bacaab70a38a490a6d6a4646
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 21:33:26 2011 -0800

    removed unused references to unittest

commit b03e28df4be7a4f0e2a88100b5677d781b70a939
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 21:32:27 2011 -0800

    add customizable tempdir and remove extra code

commit 593eb195b18165b00dfde0a5526253d0571786ac
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.

commit e4cd8f5d96e6a523b70ad73e6a45d96dbeab39d7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 03:16:04 2011 +0000

    Removing unecessary headers

commit 6a580d2c1e60adcfa5cdc95fe6e9d7f2a7a92079
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 21:59:36 2011 -0500

    Rename auth_token db methods to follow standard.

commit 0691edea27fca69f07cddeba7bd5a2bcf7f38ca9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 02:51:14 2011 +0000

    Removing unecessary nokernel stuff

commit 99bca2999e3ac75d86c04586249d6c71bef46109
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 02:26:46 2011 +0000

    Adding _make_subprocess function

commit ee61106bdeffa85b91df5485abe699a6849d8c49
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 01:50:18 2011 +0000

    No longer users image/ directory in tarball

commit 2a0d3d50a7036af188657deb24f6a62edc9efe03
Merge: 4a7b32d 72ec7ba
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 25 01:31:02 2011 +0000

    Merging trunk, small fixes

commit 21015db4e91e92db0646d65e57719c8e8c31d8c5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 17:17:42 2011 -0800

    make smoketests run with nose

 run_tests.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit d2ffda91eaf421b74a99f8fcc8044719ff05a217
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Feb 24 17:07:59 2011 -0800

    IPV6 FlatManager changes

commit 4a4dbeab46d31607ca05fba5719783b056019934
Merge: 51fcc14 4ca5baf
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 b7245cac9b3e46dde61a67f9e36f2527c2f41e54
Merge: b24ed84 71ece49
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 17:01:48 2011 -0800

    merge trunk

commit 45a9f8588ce836f6058f6f4942abe2bbc7bb2983
Merge: ecef73e 4ca5baf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 16:53:22 2011 -0800

    merge clean db

commit ecef73e33267b19b6647675f9ed45202b1cca2be
Merge: 82d2605 51fcc14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 16:53:10 2011 -0800

    merged trunk

commit b24ed84f397bde8cb1f3fef13cd20e470da45a8b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 15:44:27 2011 -0800

    sorry, pep8

commit 51fcc14abbb4f08790e160c938c7a2ab6b4860ee
Merge: e25c6b7 28845cd
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 24 23:35:21 2011 +0000

    adds live network injection/reconfiguration. Some refactoring.

commit 28845cd3c5166483cc6ff7d22e862ba9b7b89df7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 24 17:25:00 2011 -0600

    forgot to get vm_opaque_ref

commit 26045c121c23689b218fe81181abe7ba584ab40c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 15:23:15 2011 -0800

    new tests

commit e948b2f0f986264e4e663096f95661fa1e5c8ff3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 14:32:25 2011 -0800

    service capabilities test

commit 786830a29dcfe1e3a7151811234c08234a1da607
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

commit f21729a8b2f312565d5aff758174201530e32eef
Merge: 1440983 e25c6b7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:58:55 2011 -0600

    Merged trunk

commit 1440983fb47cb9ac024f4cf83cfafbaa08998a75
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:57:11 2011 -0600

    nothing

commit e25c6b760602f9382ccd76f8e979350be6b2abe2
Merge: 60bbcd2 2ca98ba
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 60bbcd22dba9a8ac40da0b23c1380db7d0f57003
Merge: 72ec7ba 372249b
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 372249b45d078391a8427d415da6554380f3f8d3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Feb 24 14:36:15 2011 -0500

    Fix copypasta pep8 violation.

commit 51881b6592a76d0d7b9edf281afbb883cfc56bb8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 24 11:17:42 2011 -0800

    moved migrate script to 007 (again..sigh)

commit 72ec7ba8c8bf8d7bf705756a10a541e3ac4285fc
Merge: ce40bd5 4ed25bb
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 d4ca93e8a858bb09abfbcfe3b4a8ff53f76e3fc0
Merge: f9b74f7 ce40bd5
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 24 11:05:18 2011 -0800

    merge trunk

commit 25d25ab2585a01ee02ac07d74e52853f951796d6
Merge: 00b8407 ce40bd5
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:02:04 2011 -0600

    Merged trunk

commit 00b84070bccb4a080924fd4d37bc78187c3565f8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 24 13:01:16 2011 -0600

    Updated email in Authors

 .mailmap |    1 +
 Authors  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit ce40bd56d29ebd8959a6d712b2b939f418c31a06
Merge: 38115f5 2f7ee68
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 38115f5b96e82cd229561ce1b2ce4ae21d74302b
Merge: 6c0c49d ec777c3
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 6c0c49dfa104c08ad9e72b75d095450941964426
Merge: f8a2b18 a3f50b9
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 f8a2b18b8b23cb5dfd1621a988c8a17798fb9610
Merge: 00bf4c1 d3174a6
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 00bf4c1ae0a4f042aaa0fcd8adef989b9047ccb4
Merge: 33740d2 d45a79f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Feb 24 16:15:04 2011 +0000

    Globally exclude *.pyc files from generated tarballs.

commit f1c062ea07f6e26fe31aa03cc6b6be1d294da54a
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

commit 9da098498643565f6ec4e477cd01c644000bc1e3
Merge: 29dbec1 33740d2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 24 15:40:16 2011 +0000

    merge trunk

commit d45a79f888fa0251dac8e402edda94712681362b
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 files changed, 1 insertions(+), 0 deletions(-)

commit 2f7ee6852ae5ecb50a99f83abe6324968c230c4d
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

commit d3174a6bc0a7f2f37398ca7db3881ccafc3b4365
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

commit 1b3196387f19ca3a1c1d195bd421f8f90fc545f3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 24 01:53:01 2011 -0800

    capability aggregation working

commit 82d26055054999e152597ddaa9d99651b8a466d5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 00:25:21 2011 -0800

    fix check for existing port 22 rule

commit a18eb1aafcc5f3fe9c5f6c99b62ea3515c4b45c3
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

commit 4ed25bb03dc0263ad283b7b71203701e619fb7dd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:53:44 2011 -0800

    Hotfix to not require metadata

commit a3f50b965a71c2570764953f72ad93cb77a5151e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:47:57 2011 -0800

    Documentation fixes so that output looks better

commit 9c8b7e810d2aedd4811439ab378d38a4111ce8b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 22:40:50 2011 -0800

    more smoketest fixes

commit c41133872b5fde25e61307f53f92835cab13a5da
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 files changed, 0 insertions(+), 1 deletions(-)

commit ff99607f89a060cabc56eedf5f3341e4f72462a0
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.

commit 33740d246f52a6abbc0fa018e0dd8c7f0bde90fb
Merge: ad4971d aa8e319
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 24 06:04:58 2011 +0000

    Change missed reference to run_tests.err.log

commit 865027dd0a6164c9ef3748efe46a921a85f4dc76
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 22:02:06 2011 -0800

    PEP 257 fixes

commit c2288511e6bcad6c76ff8c8a727413372c2590d1
Merge: 97d73e6 ad4971d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 21:47:29 2011 -0800

    Merged with trunk

commit aa8e319487ba6320cf3cc942da5fe5d4eef33924
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 18:54:13 2011 -0800

    fix missed err.log

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 476e8f3835131aa8d7555d367d85acdc067782ad
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 23 17:58:32 2011 -0800

    Tests all working again

commit 36fd2e11160985fe8117f2bc397212340c418427
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 17:28:38 2011 -0800

    remove extra flag in admin tests

commit ad4971d3e3371c1ea21e79eb99fe3eab4cbe63ce
Merge: 98938a0 bf3009a
Author: Dan Prince <dan.prince@rackspace.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 98938a0e86e80a36e7931c1fd09ec91ff86fafae
Merge: d4cc0c6 5bd3613
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 e4b976dc03866cfacecc6203a28dfef2e4962fbd
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:59:54 2011 -0800

    Reverted bad-fix to sqlalchemy code

commit 7fceca0580b9a0d2e7ecc31c9681840179b47d85
Merge: 470dbc6 d4cc0c6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:51:48 2011 -0800

    Merged with trunk

commit 5bd36134e37ad0311ea7413eaeb718982b8c6622
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 files changed, 3 insertions(+), 0 deletions(-)

commit 4ca5baf5faa08418fb3000ade4a7c801a7f46604
Merge: 1bf8cdb 1c225f4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:37:00 2011 -0800

    merge and fix conflicts

commit d4cc0c64d40560bccbe113641acc72cc65beb9b0
Merge: c18dd7c cf5e167
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 1c225f40efedf486a708db08f97fb4d9b43bcef5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:35:30 2011 -0800

    fix pep8

 run_tests.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 1bf8cdb8c49168fdac0a9aeae88c3c0d132cbd10
Merge: 81322b7 0abda0f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:32:31 2011 -0800

    merged upstream

commit 859a4478b7af2b34051ba96ee847763e50f28300
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:31:40 2011 -0800

    Changed create from a @staticmethod to a @classmethod

commit 0abda0f049f6f509130286d277028895545e2aaf
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

 run_tests.py |   16 +++++++++-------
 run_tests.sh |    4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

commit 3b0a807d4ad7a4c757b2065361ff52939e82a5ae
Merge: 182abca c18dd7c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 15:27:54 2011 -0800

    merged trunk

commit ec777c391d7b15c6bde19ac4034797118f1b3923
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

commit b2f15311799a94178162f327efc4110b13aa4cc5
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 15:17:32 2011 -0800

    Alphabetize imports

commit 2ca98badf9450e6832e3fa5e33224e2cffef2108
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

commit 4fc306693b82cc6c3337d59f1b003f474b68fd02
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.

commit c18dd7ce965f0dc48037231e9b873fb24ae4b160
Merge: b30b2fd 85cfce9
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 0d903ea39cfe13954081de207a04e8635dbd047d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 23 14:41:11 2011 -0800

    tests working again

commit 85cfce9fb82327ea38c792f09bbdb285c26bff37
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 14:16:31 2011 -0800

    Put back the comments I accidentally removed

commit f1594721c420cb6b99e51aab7888fb113f8f2437
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

commit 0f247c1b8ce711f3920954373aeb3c5db8fe83ca
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 14:07:08 2011 -0800

    Rename minixpath_select to get_from_path

commit b30b2fd31ae7819f7dceb43e32a5802da26fca7b
Merge: deb2046 efec2ae
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 245c9c097c2d128234919fd94b158274bbd8f61f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 12:55:07 2011 -0800

    Fix pep8 violation (trailing whitespace)

commit efec2ae89989015b0796d359af9e293733d04b73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 12:54:46 2011 -0800

    fix describe_availability_zones

commit 6e9493b2f6c934374d75214aaeddd3ec5ddbcc1a
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

commit deb20469cd0c2a6837d18a5781e5bc2bec2dafe5
Merge: 9842914 1b1df26
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 e8122e1b2d2499b9f8b59528d167c164fc33d7e2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Feb 23 12:05:49 2011 -0800

    Created mini XPath implementation, to simplify mapping logic

commit 81322b76b5945445ea7d918454f99b0c9dc487aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 12:00:02 2011 -0800

    move the deletion of the db into fixtures

 run_tests.py |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

commit 97c1ae0314ba4a12dac6391ceea171a2fec729d2
Merge: 6f868d9 6b64bdd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:56:37 2011 -0800

    merged upstream

commit bf3009ab460ab9388b3dfcc8f0dc66e6f5f3883e
Author: Dan Prince <dan.prince@rackspace.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.

commit 6b64bdd54095780289b8fc18e7778cfa1375bf5b
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

 run_tests.py |   16 +++++++++-------
 run_tests.sh |    2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

commit e180095f44926d4abf36d0d8b286e4861e6bcdf3
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Feb 23 20:51:27 2011 +0100

    Deleted trailing whitespace

commit 984291417e777b5e252b061bd590975b2a85647f
Merge: 3cd7a03 6a3f6c7
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 bb51f4c80bb8837d6c8626052065548666d82b86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:44:09 2011 -0800

    merged trunk

commit 6a3f6c76dae6273574bbab0a95fb41e3480e7032
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:26:38 2011 -0800

    fix for failing describe_instances test

commit 803bc737ed06ac52054d05edca21c32b52252017
Merge: 6bcdb5d 3cd7a03
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:26:20 2011 -0800

    merged trunk

commit 6f868d9e8dd12b3625f04bffc5bdbe06315aed69
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

 run_tests.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

commit a8bc5421d6210d2ae87b38e2f29ebed6e1c5edaa
Merge: f32577c 61bf183
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 11:20:07 2011 -0800

    merged trunk

commit 639eb019c884f1438ea5e3765b69226ed37d8711
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

commit 3cd7a03e427ecebc126b8ee0aa42220966a1b3f7
Merge: 3e7fcf2 dcc1000
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 3e7fcf2367b41c7ad5127d89e649284742d71864
Merge: 71be567 31e997e
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 71be567f714d5b88676f9039536c9c99902a5d17
Merge: 61bf183 f67fff0
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 6bcdb5d9a9ba8d9d862ce8c9e824f151fd60513f
Merge: 8168a93 61bf183
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 10:29:54 2011 -0800

    merged trunk

commit dcc1000ee2da12b5a91154e4a72b308c8c8b13b1
Merge: 8b78e0d 5751600
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 18:26:04 2011 +0000

    merge trunk

commit 61bf1835d56ec6f13dac6bbde66b06e03b00c6ae
Merge: 5751600 bd2e7db
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 7c5d0fc3de6b1c9497067ac4aacc982f24af2633
Merge: 6db9cd4 5751600
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 12:10:52 2011 -0600

    Merged trunk

commit 6db9cd41718512fff55c7cad5e8c01627e6143a3
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 12:05:46 2011 -0600

    Removed pass

commit bd2e7db977c3a4b8872166e863c1ba9c83faa064
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.

commit 5751600d6bae5e28075837a87932a15e3404d55d
Merge: f280555 c243df6
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 31e997e0905bb02bfa9b937b8faea6204f118651
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 files changed, 12 insertions(+), 1 deletions(-)

commit 3cd12ce8b88520a8e3475536a84d80a2f5d3640f
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 files changed, 27 insertions(+), 1 deletions(-)

commit 2f3584fd5a4b42d601e57f2a423314c504bde09f
Merge: fa8464f f280555
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 23 10:45:04 2011 -0600

    Merged trunk

commit e8dae9cd9b822cc893c4706c3e40da485f48fbf5
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 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 8b78e0d5a06563ccd49644a846d7873b54c96a10
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 23 11:49:47 2011 +0000

    Fixed pep8 errors

commit 07ed0a68a39ff904f921431e4ee2f6990df69e4d
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

commit f32577c7e7031e1b7701d4867701f15104f657c8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 01:52:07 2011 -0800

    speed up network tests

commit d9a7add4555e93593cc855b3d6610863b9e2d348
Merge: ac10e10 f280555
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 01:51:47 2011 -0800

    merged trunk

commit ac10e108e54d55e1b853ff97536312b65ed01f9c
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

commit 182abcaa5f15c07499fbf90f5d451424c8953461
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 23 00:59:15 2011 -0800

    fix failures

 run_tests.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit c243df6a80953896ba8be0d5b40669358db5e894
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 23:30:52 2011 -0800

    remove unnecessary stubout

commit b77f98490630b2a21e20b9134f7f805d31641dfc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 23:21:01 2011 -0800

    Lots of test fixing

commit 47fae5aae5b718f126becc48ac588b7a10fd92d0
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.

commit 5d177f945cdf7685cf1f81832d1a7f92945072e9
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:59:23 2011 -0800

    Removed unused import & formatting cleanups

commit 97b5824e3552184c91232f2a03bae2a8d4aa7e56
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

commit f67fff04e784bb2628f4f516723e186eb0547a84
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 18:42:23 2011 -0800

    Return null if no kernel_id / ramdisk_id

commit 95179ab0ad6bd903bc08c4f816f5423cea9597e0
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

commit f12b9ea6f43ac8e9d42287cbeec7d0bf80eb2cd9
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

commit 1b1df261de38e40fef557b1802b57f62fe2e26c1
Merge: e05b2cf 8168a93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:05:16 2011 -0800

    merged fix-describe-groups

commit e05b2cf6d3b1412c6707a0c45b590d3c5c2cc468
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:04:32 2011 -0800

    add netadmin smoketests

commit 8cccdd38d6e70523c0bceb717b308e128eaa6b6b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:04:08 2011 -0800

    separate out smoketests and add updated nova.sh

commit 8168a93a15acc01bae1d6b4e3dd1217daa7455dd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 18:02:25 2011 -0800

    fix and optimize security group filtering

commit 057c1dea91a6fb64b3db3c6fdaf2513c1cb7a6b3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 17:58:01 2011 -0800

    Support service-like wait behaviour for API service

commit 6d27ad30a2b818504802374461b689c05852d51a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 17:50:26 2011 -0800

    Added create static method to ApiService

commit ff645a740922b4a5806a1283c27957669660ff9b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 17:49:38 2011 -0800

    fix test

commit f858602b47d3f8ee163a6a4939fcf152d701cde6
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

commit 90e251e196d0e02d0d678c49bdd71a26654decdd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 17:44:07 2011 -0800

    test that shows error on filtering groups

commit cf5e167072165ed4897c326c0835b20ca9e0e027
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

commit 470dbc6e987510f65960be1dfbfb25f60b5e288c
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

commit 1c793df3b96e4293df52f91c18563a8b5e313b39
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Feb 22 15:50:42 2011 -0800

    Missing import for nova.exceptions (!)

commit f280555fab2ba75d3ac1889d1d92c420577488e5
Merge: 733f58c 7d0d4b4
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 5452f5d14090a2650cfb1d5bf2f773133aa6f71c
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!

commit dd89c608d72d1746c2122c2f885f8770d1020755
Merge: f772024 26899d6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 13:42:26 2011 -0800

    merge fixes from anso branch

commit f77202445b9df7a9ec05c0a01802a299b82827e3
Merge: 9e8206c 615df31
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 22 13:36:18 2011 -0800

    merged trunk

commit 29dbec16e83e772304a8f8f303520c54d627f38e
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.

commit c64287d47a07cf35f0cdb6fb85b61ab4d2494ac1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 348ef615a66a5028d8bfa76f42678a7324ef7796
Merge: 990c0ef 733f58c
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 990c0efcc851a9fec77c723406a8505138444959
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 20:12:30 2011 +0000

    Put the whitespace back *sigh*

commit eec0fee58fa70bd421a32404f19d2f07e6e8deb3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Feb 22 19:54:42 2011 +0000

    Remove duplicate import gained across a merge.

commit 8aab6b98b5b7445a13186703fe1be5bddb0e9696
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 20:45:36 2011 +0100

    Rename "SNATTING" chain to "snat".

commit 733f58c9c4cf5faba760686e1874b2e93757f4aa
Merge: 07cfd7f 72d5ac7
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 72d5ac7c12d9cc1bf9d7ad574b12c4c32d4d1727
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 files changed, 0 insertions(+), 1 deletions(-)

commit 2fae44bd24419eb067d3a8e1df9031be7a5d98e6
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Feb 23 01:20:39 2011 +0900

    Fixed some docstring

commit 36dfe146e7e03462843241b2530997241f956c43
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 17:18:04 2011 +0100

    Get rid of nova-combined, see rationale on ML

commit d766adbecc379df4b108beb26a53f96d4c055e2c
Merge: 72ba0ca c4611e0
Author: Thierry Carrez <thierry@openstack.org>
Date:   Tue Feb 22 17:16:43 2011 +0100

    Merged trunk

commit 07cfd7f041f19ed199043fdfb3f3006849344e0e
Merge: c4611e0 db13f19
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 22 16:10:19 2011 +0000

    no, really fix lp721297 this time

commit 10996ba7abe2fcb61a147fa03a061b3e67196410
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.

commit c4611e0c55df8040aa90ce8cf792ae31799e2e7d
Merge: 865c2b7 d4d2c66
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 93ab575de30b55eb18f924835ec4314c37229933
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Feb 23 00:15:39 2011 +0900

    Fix tiny mitakes! (remove unnecessary comment, etc)

commit 01b60a78dc41173fe1efc323ba8b5bc5efc66f49
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

commit c1423d1c1b510c30e6ddf1db86b863c44cfbcc08
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 14:40:00 2011 +0100

    PEP8 again

commit 084180fd47ca8fffe98d6f919fd03aa79371df7a
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.

commit f92ca50b86b26783a218c6eb53a02a0cdf462e74
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.

commit 639e6e6e3c41cec60ed0b1ea8368281ef6e21ff8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 12:21:29 2011 +0100

    PEP8 adjustments.

commit 7ee629a93026e11bef7203c66a3bd26b4247ab1d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 11:47:46 2011 +0100

    Remove leftover from debugging.

commit 90815b5ff410fdb8838a77aded4a57191946a32a
Merge: be5ed45 865c2b7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 11:40:57 2011 +0100

    Merge trunk

commit be5ed45b51e09c8ef6bc3cea1c4477fb4ccc9fce
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.

commit 865c2b7a641bf3329f1a27876af5fd3d5c0764e4
Merge: 9b2d6e3 ab940d4
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 f9b74f711d4425c6835b48b7e3f4cc12983938d4
Merge: adc4a4e 9b2d6e3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 22 00:43:25 2011 -0800

    merged trunk

commit 8ca5107563722814939afaa10be65ff14ded39a0
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.

commit 5a2deb2ea540db21ea6b20b19626f49bb3438cd0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 22 09:00:29 2011 +0100

    Address some review comments.

commit 9b2d6e3e5730c7ba69fe6f6d1d9bdafef2d0c608
Merge: 0eb00a1 ec17d14
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 d4d2c6687fa9032b71cd84705d08964d58b8e8b3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 23:26:03 2011 -0800

    use a different flag for listen port for apis

commit bc271cff57b53a4c6fa7239e82f753f9051d3573
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

commit ba77882e0517fd65f1a2ed5f248b747a798bfa2c
Merge: d780689 0eb00a1
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 d7806892bb4c2db1e6f9db34b13e6383ede989fc
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Tue Feb 22 13:18:21 2011 +0900

    just add 005_add_live_migration.py.

commit 502cd432483cfbe5da419692e7e51542bd4ed8fd
Merge: c9cf57b 615df31
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 650a0c3e4af2090d246d14ef5abb1e4d85e7785a
Merge: 8f1524e ab940d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:22:24 2011 -0800

    update based on prereq branch

commit 8f1524e8bf9059fdb0af386da0949c80e40969b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:22:09 2011 -0800

    update based on prereq branch

 run_tests.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit ab940d4df0328581f45d3ae4090d19bde77b50ac
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

 run_tests.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 9b1c1bd954189088e824d34767030840b78f7cb2
Merge: 4a14ee9 a724411
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:07:45 2011 -0800

    merged fix

commit a72441151c6aeddd7eea3104df57d2f813170cd9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 16:05:28 2011 -0800

    remove changes to test db

 run_tests.py |    2 --
 run_tests.sh |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

commit 97d73e6629c6a06d3bbc333dfbfa729c9ae8cc1f
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

commit 4a14ee9ad4e1b741ed2321b27ee76d1f9a0ea26a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 15:55:50 2011 -0800

    pretty colors for logs and a few optimizations

 run_tests.py |  202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 200 insertions(+), 2 deletions(-)

commit 095fe4049e3ba6051b16e44d9199b4b2c8e2a830
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

commit ec17d14ba8eca73c25b450673afc6bb63f1270d9
Author: termie <code@term.ie>
Date:   Mon Feb 21 15:42:16 2011 -0800

    modify tests to use specific hosts rather than default

commit d06a47e42e88a436a3e30d69bb1a8b366d0b7926
Merge: 401a740 0eb00a1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 15:25:42 2011 -0800

    Merged with head

commit ed5ff978ed298ab28c3486970ae1a88af8d3f1ba
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    remove keyword argument, per review

commit 59fe5f8ab61fa06f3330264b26438d5460376a7e
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    move test_cloud to use start_service, too

commit 1717daf9eef665247c0411f6e45e229e7067d3ea
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    add a start_service method to our test baseclass

commit 2ab3c69684b4facddcd4597be7ba74a884c3e4a8
Author: termie <code@term.ie>
Date:   Mon Feb 21 14:55:06 2011 -0800

    add a test for rpc consumer isolation

commit d5ca674867e8527b4bf6a2325a58d096fb3e6cd1
Merge: de62bd7 0eb00a1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Feb 21 14:47:33 2011 -0800

    Merged with trunk

commit 0eb00a14ba2716478a236bdb05962a8e21dcb651
Merge: ef88d00 ecc0fef
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 4bfccec39859a779f9bc3537e776ad8a03ef99b7
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.

commit 69909cf4c34a96f8eff85d2b1f7e607c2e1acbeb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 13:59:46 2011 -0800

    fix pep8 and remove extra reference to reset

commit a3f2cf441823b37686b0f1ce5ce54de29295be31
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 13:46:41 2011 -0800

    switch to explicit call to logging.setup()

 run_tests.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit db13f191c4129112bbfafc2df9b2f655f5dacb35
Merge: 0b1a6be ef88d00
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 21 13:29:41 2011 -0800

    merged trunk

commit ef88d001391677626e78687e6778bee42919f020
Merge: af05c27 13f27de
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 ab5d7e28681ec8e4a01b44a47e5e0239785d8508
Merge: 3514da0 af05c27
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:43:38 2011 -0600

    Merged with trunk

commit 0b1a6be7ebbd1629acce1323d4b36304b46d4a05
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

commit 3514da0b63f20595657506fc6b8e4fa17474e5c3
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:35:30 2011 -0600

    Removing pesky DS_Store files too. Begone.

 .bzrignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7c80f6b7e8beb66415069b43a3eadcb01e2681dc
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 21 14:30:20 2011 -0600

    Updated to remove built docs

 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 +
 77 files changed, 8226 insertions(+), 0 deletions(-)

commit 7c8db91526471fb982979e5970c4f199fdf7f7cc
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

commit af05c2729d9b2a3d8c771fb82b58fe8db59515a1
Merge: 615df31 c98aeff
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 f821d66c37c114fd660c03b0ec88fd8f3da9e165
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

 run_tests.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 247d684719c43984c9cb97c9bac80923460436bb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 11:07:50 2011 -0800

    cleanup from review

commit 13f27deb21e81e943222f2e5dc121b7a6c5559c4
Author: jaypipes@gmail.com <>
Date:   Mon Feb 21 13:55:25 2011 -0500

    Duh, continue skips iteration, not pass. #iamanidiot

commit 8425277b1d9c8d1fdcdca395448c80c2811ff69f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 10:52:28 2011 -0800

    reset to notset if level isn't in flags

commit fa8464fd80316bac7bf342d6eba49958899f9fcb
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 12:48:34 2011 -0600

    Enable rescue testing

commit dac46703e0a825b833facef668890f0fb6fe6c73
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

 setup.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit a3ab33b50e8b5b9a795b20db8090070061a4559f
Merge: 1f28ad3 615df31
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 11:24:26 2011 -0600

    Merged trunk

commit 1f28ad36fec6cf90f009de0482d25dd2ae4586f3
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 21 11:20:03 2011 -0600

    Stub out VM create

commit 54d8599f7dffc6b2b153cb2ef1b7bfe5b3ddf452
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.

commit c98aefff003b158798039f392775a41e38d4cc3e
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

commit d8cbb25030cdc7e9aca61e6c2c35c29b789b26f4
Merge: 4b26d8c 615df31
Author: jaypipes@gmail.com <>
Date:   Mon Feb 21 10:04:32 2011 -0500

    Merge trunk and re-run build_i18n

commit 0c01f926ddb2c154f034fd9a09a0ef7470319776
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'

 etc/vmware_guest_tool.py |  326 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 326 insertions(+), 0 deletions(-)

commit b2571a8d8926b4f4f10a9fee1bd3d40848430382
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:39:38 2011 +0100

    More PEP-8

commit cc2c5b36d67c15eff7835d655609476405885c6e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:39:02 2011 +0100

    Wrap ipv6 rules, too

commit e866fc3132678625f9107e1c96f5b87a57440bcb
Merge: fe23404 615df31
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:28:48 2011 +0100

    Merge trunk

commit fe234042c92d4b407c559d0737d19ffc3e1e2293
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 14:16:42 2011 +0100

    PEP-8 fixes

commit 6bffa1e605d1c6c9a267f313116544248616d22c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 12:22:29 2011 +0100

    Allow non-existing rules to be removed.

commit 4a8d0759b524e2b0eaf1c6b19861279f49c04061
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.

commit 81174f04a822a9a2807c89d3fa4a7b1830e59564
Merge: 2e9bf14 615df31
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 21 10:26:44 2011 +0000

    merged with nova trunk revision #706

commit 637fe31894fe77e12d537e6835bb2dcc17f84809
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 11:01:27 2011 +0100

    Fix typo

commit cf50e4e54cc5edab502c89ece82243d83a410e59
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 10:42:59 2011 +0100

    Unfilter instance correctly on termination.

commit 718f617b06227468c1da316566950d110f30dfdd
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

commit 010af8859da9ecfdb141a8fda7821d6342c17175
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 10:18:43 2011 +0100

    Also remove rules that jump to deleted chains.

commit e50efdb184ba6fbb0e7a8e9ad750621c5c1f2636
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 01:07:46 2011 -0800

    simplify logic for parsing log level flags

commit 7a6be99664bed7cc22216733e99a713bd78bedb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:48:33 2011 -0800

    reset all loggers on flag change, not just root

commit ede4c99f27a45c80ad012f8da25166b2d03f4b26
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:24:35 2011 -0800

    add docstring to reset method

commit 8d82a227242538dd13cfe443a5e9f42b794a650e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:22:45 2011 -0800

    removed extra comments and initialized from flags

commit 536d782e65e158d34fc0eb22b1532870bed4e1b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:17:58 2011 -0800

    fix nova-api as well

commit f505254ab0d937ba1097f94e57765c2c439f4eaf
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 21 09:17:33 2011 +0100

    Fix refresh sec groups.

commit 6d32c3681bc8a2d8c11838e7e764305c93e0e5a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 21 00:15:49 2011 -0800

    get rid of initialized flag

commit 3dcd00be08b588298f067c366c71ac0aba1478ab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:45:43 2011 -0800

    clean up location of method

commit e22875507ac50b0b4908174539a351d4361c5ff4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:36:36 2011 -0800

    remove extra references to logging.basicConfig

commit ac99531d49a831e7d438cd2f16d9afe7decbd664
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:18:09 2011 -0800

    move the fake initialized into fake flags

commit 8cb6306b7bed15f3ba62d2dc42a1ce70cccd0d31
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 20 23:16:10 2011 -0800

    fixes for various logging errors and issues

 run_tests.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

commit 64bc65d25b116bf25a9d8e62db31bc76251c5273
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 22:33:39 2011 -0800

    fanout works

commit 8561eb4438ae4c17e2c9194f900025fce0a47846
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 20:58:59 2011 -0800

    fanout kinda working

commit bc5e0aa21ba939695686b793295eec58475f6d43
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 16:40:08 2011 -0800

    service ping working

commit b0bbff26df871e3573f3fc737a75346e6297a829
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Feb 20 13:36:45 2011 -0800

    scheduler manager

commit 33aebcd45b824a127e3a1520db89a77e593aa3a8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 19:27:15 2011 -0400

    tests passing

commit 8fc02aa181dbf5c6ea8fe1148f9cb24de9598ec8
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 16:28:04 2011 -0400

    start of fanout

commit 8932aca9aecd58fdb36eafe9d8ea3a8faa4b0483
Merge: 62978a5 85728e3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 15:11:16 2011 -0400

    merge trunk

commit 62978a591f0dec8d12745b7fe806a788ee75023e
Merge: a09ac2a 6da8d9a
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Mar 3 11:09:33 2011 -0400

    previous trunk merge

commit 7d0d4b4703f52e1f982dfe3270452533c5aa7604
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

commit 615df31b2d4f845a81299ba1b37aedd43899c640
Merge: 6084c4a 41081c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Feb 19 21:39:44 2011 +0000

    Various optimizations of lookups relating to users.

commit 6084c4a9576b1cfc818292eb11e213b05ff81516
Merge: e4ee896 105b548
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 e4ee896dfe0c64a05ef7a7ddeb2792a4190e2a4d
Merge: 651b7c1 a5bfd38
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 651b7c198d72dc22129dc0c9a30e2c55e87383d3
Merge: 25f478b 8aa6336
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 25f478bca986ce55b2657be41351c83464ccbd7c
Merge: c59b6a3 360c8b7
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 09:59:41 2011 +0000

    Calculate time correctly for ec2 request logs

commit 8aa633699cd4ca6ed47a5a1c2fa5c108313ddc2b
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

commit 0739c8f30d3cb6a285b1c817cf4332b8f2941147
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 19 01:51:13 2011 -0800

    pep8 leftover

commit 360c8b7d82830e02b8101bf179e1c1c6028e9f53
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Feb 19 01:36:13 2011 -0800

    move from datetime.datetime.utcnow -> utils.utcnow

commit 242af0f5b1163401fa56ef0b3a359ab117f3edfa
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

commit 24d06529e810238c682f49f227aa277cbf3b66d5
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

commit ecc0fef8ce0ce85ad99bbad9811ecc091d5ef096
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

commit 41081c1e7b2b328636cde731e9bed5c0b5c12ad9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 23:15:42 2011 -0800

    more optimizations context.user.id to context.user_id

commit 2f140bc958bdad4962e3aebb412b605a3917887e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 18 23:00:28 2011 -0800

    remove extra .

commit 5d3ab053ddb98b5119ebed809f4fcd4b1c96bee1
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

commit a5bfd38e4cbfe6ab5d10302779b89951414ae1e8
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

commit fdb595c5c3f25748e2ef1d51d5835d89413eb0ee
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)

commit 0a3e59a738a62346aeac93d30d23b4b041e0de50
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

commit adc4a4eb1de2c36c6ea09bb943844f73b89008ff
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 17:17:47 2011 -0800

    added purge option and tightened up testing

commit 65e0b8c0ea3392e50a2d8af850016e5b287bb317
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 01:28:26 2011 +0100

    Wrap iptables calls in a semaphore.

commit c83cd557615687c4284f29f7f306cd32d2dde0cf
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 16:00:22 2011 -0800

    pep8

commit 0e9206c319d878b367b8b0e73919533714bfd39c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 15:59:42 2011 -0800

    added instance types purge test

commit aed64267c049e3f650f5032655f83f712eb578ee
Merge: dc881bd c59b6a3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:37:15 2011 +0100

    Merge trunk

commit dc881bd06aad5c73c7abd0f5725bf3c7dbf6782d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:36:34 2011 +0100

    Security group fallback is named sg-fallback.

commit 12c11dfdcbf648e4b8fd7f86d56bcdb65a5ffa31
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Feb 19 00:30:44 2011 +0100

    Rename a few things for more clarity.

commit 9693e3cc51152e1cf87beda20ae9740334d51e63
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

commit 31d91228bed701a3219898485bc3adf8cdf97f83
Merge: 4f52a90 c59b6a3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 18 14:54:23 2011 -0800

    merged trunk

commit 4a7b32dc6c2a5fc8dbbf726dbd3cedfce6ee15b7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 22:50:13 2011 +0000

    Typo fix

commit 100c588e7ba8957743d200516e5d3008ee0b7473
Merge: a07776d c59b6a3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 18 16:45:31 2011 -0600

    Merge from trunk and merge conflict resolution

commit 51eefb67d1b0db6a19c391c36e717bb830d35e6f
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

commit 105b5483c4f98bbc818799fae304fe54f143ef57
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

commit 56e439703f3b7362e5a014dced972248029d4185
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 14:35:12 2011 -0800

    Fix typo (?) in authentication logic

commit 7b68d2c8c5627524fd87390be1b0d79476c463b9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 22:25:19 2011 +0000

    Changing type -> image_type

commit a07776de8b2247cd6493390917f50e8045ff1a62
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 18 16:13:34 2011 -0600

    Pep8 cleanup

commit 66aa4a50d69227ec45fb6fd1dcfd71d2202d4f9a
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

commit a4573396e3a5eeaa672634397c2930829c22eaa9
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?

commit bbf452acbb42d37b3c362469767e730b02f0c872
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 21:42:04 2011 +0000

    Typo fix

commit ef8130e2ca41b705b2287d3f4096f019b09637c2
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 21:37:57 2011 +0000

    XenAPI tests

commit 54704f99d27d6fe37f3ee5b83c4a823225ef75cd
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.

commit c59b6a37d67f14f31cfabe0a7f23ceec48b2c961
Merge: 35f3894 24e095c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 18 20:59:49 2011 +0000

    Use WatchedFileHandler instead of RotatingFileHandler.

commit c6f916720aca48c062def49bd9cdd0fd794ed6dd
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 19:04:57 2011 +0000

    Resize compute tests

commit 401a7406d16c17d2c55a6e8318f7ff134674bedb
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 10:57:19 2011 -0800

    Support for HP SAN

commit 56afd0c352eb1fcfa5048787bb4ff335e8877710
Merge: 10a9827 35f3894
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 de62bd765cd426c605599c1ee520aceb0746ede3
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 18 10:14:56 2011 -0800

    Rename migration 004 => 005

commit 19c57e462cce2130017bf8385637ec3fbdf4f34b
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Fri Feb 18 11:44:38 2011 -0600

    Added Author and tests

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 680aea369f2b65f58d712f272e3e8d6c657fc519
Merge: cea9f17 35f3894
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Feb 18 17:33:18 2011 +0000

    Merging trunk

commit ebdfad29e6d2157af3bb3e14d1571398aa368ce3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 18 12:08:35 2011 -0400

    fixups backed on merge comments

commit 72ba0ca50c60aa0934e685716dc9fdc099f7d6af
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:37:00 2011 +0100

    Fixed testing mode leftover

commit 2dcd94afc2b55cf5d631b7281ea12354e5f2bfde
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Feb 18 16:23:52 2011 +0100

    PEP8 fix

commit b0dca782e07c4bae0dde0f6436a7eed76940bef4
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

commit 6518747ae1a644162e4aadd87dde95f0797f0c6a
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

commit f11832181f723146696b983766fd47c9ec37fffe
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)

commit e9ebf8178893a5f2f36c15e26e23a7fed01db16d
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

 etc/nova-api.conf |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit 32debb992b011be652f71f8d76268333dd837503
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

commit 9520361c0b024c5731760bf42aa669f694120a1b
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

commit 24e095c0077f1b27e72e3a7b424254f7f66886da
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 18 10:24:55 2011 +0100

    Use WatchedFileHandler instead of RotatingFileHandler.

commit 10a9827d100f14bd1221ee645386c6e80065b0c7
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

commit 2f09abfd99da8e450a5d299542148a3c0fae2138
Author: matt.dietz@rackspace.com <>
Date:   Fri Feb 18 06:03:15 2011 +0000

    Resize compute tests

commit c9cf57bcfbf6ee56cb62dc734b08e04659b582a8
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.

commit 8b97724bdd942cb12e20529820a49dd2e44aef28
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 23:09:06 2011 -0600

    Tests

commit 4f52a9057dfa96eb347e44f0a43b8e22454416a9
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 17:42:49 2011 -0800

    pep8

commit dad7aac305fe19bc3d5a127d4e9dd13007624ecd
Merge: 9e61193 35f3894
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 17:41:36 2011 -0800

    merged trunk

commit 35f3894dca127b937d5f0cf518c9b1363fdabc3a
Merge: 9d51e1e 489c2a9
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 9d51e1e67154ef496217a2b8cda1a614bed7375b
Merge: ca7eecc 0cec511
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 9e61193481d5670796cb7c6ba1795a2c555dcbe8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 16:22:04 2011 -0800

    changed migration to 006 for trunk compatibility

commit 53e4addbf5093cd6de6dab2cfccd5e2eeae34780
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

commit 015dcab9cd504ebcf951635f56997f6618d91365
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

commit b392d115f87799b53b217f8ae2d2757036d4c614
Author: matt.dietz@rackspace.com <>
Date:   Thu Feb 17 23:55:56 2011 +0000

    Test changes

commit 5542704bbc77ceced39cb2dff92ab529a352095c
Merge: f05bc78 ca7eecc
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Feb 17 15:36:10 2011 -0800

    Merged with trunk

commit dad5f0c6a624dbf4769e69223da9da3937e6ee93
Author: Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Date:   Thu Feb 17 17:13:59 2011 -0600

    Always compare incoming flavor_id as an int

commit f05bc78a794a85b41bc6c5901f8002340a832ac2
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.

 run_tests.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

commit 157aab7d1d0dfe2815bfdc56a79a13cf886af6cf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 16:52:31 2011 -0600

    a few changes and a bunch of unit tests

commit 489c2a902501b474e9b3c4464fac805be4ebe0ca
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 14:50:29 2011 -0800

    remove leftover periodic tasks

commit ca7eeccc28a081b389433d494e05a11854b75f46
Merge: dc48ed6 2ed03e7
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 4534a878e86ee4df072fa367f921299e1859cccd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 18:49:30 2011 -0400

    missing docstring and fixed copyrights

commit 81c6c1e582ddcab3edd07b771a3d1f3bf346631e
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

commit 0cec51151a6865d35b01b75a7c55373ce6ba40fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Feb 17 14:14:07 2011 -0800

    Correctly pass the associate paramater to project_get_network

commit dc48ed69917693c0967ad476978eed7de00a6a41
Merge: a35d98e 531510f
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 2ed03e7b4c3d110fa5567a6827d500bb845dc282
Merge: a7e001e 64a7204
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 cc414549f029a4c86cb424b5971a66c2538a6ee3
Merge: 0418ba8 c1ca561
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 18:08:11 2011 -0400

    merge with zone phase 1 again

commit a35d98e8968e7805122b20cd2d7a716e6185250f
Merge: 64a7204 c1ca561
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 0418ba8415546cde5b293454ac84eed518640bda
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:58:38 2011 -0400

    pip requires novatools

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit c1ca5610dddbb42539a461c27f2855bf14831810
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:51:24 2011 -0400

    copyright notice

commit b812bf2124179ca1e73fd0abaadc2a768b0a6133
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

commit 531510f6661c802eec13a589cdba8134bd003b81
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.

commit 7e24e7ac1ecef69993550bb04e2c7d21cae33391
Merge: 06a1cc7 bc53704
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:40:57 2011 -0400

    merge with zone phase 1

commit bc53704601499fe48e0c6caaa1895853fc4e69a9
Merge: 02fc45f 64a7204
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:39:03 2011 -0400

    changed from 003-004 migration

commit 9e97954266645140551045cc5e59934c0bf94951
Merge: e6fccc1 3854e05
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 17 13:39:03 2011 -0800

    merged lp:~jk0/nova/dynamicinstancetypes

commit 3854e05f368fcabb8ed67ac8fbd1c1a30bd7772c
Merge: c242e32 64a7204
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 15:33:14 2011 -0600

    Merged trunk

commit 06a1cc7c515d0597a65ac9a0fd257b1f5bb52c95
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 17:32:25 2011 -0400

    merge from dev

commit 78b4477e369e249c03155162c456f47b5616fa63
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 13:29:19 2011 -0800

    fixed strings

commit 62a587c34c6f44c5986d45145a2bf0a6ef430dbf
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 13:23:56 2011 -0800

    multi positional string fix

commit e13fb28e584b05894e97d94f61c8baced5c15c64
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.

commit c242e322a429b24988915d5d631e76a828aa2a8a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 15:05:19 2011 -0600

    Fixed unit test

commit 00d7234a1ad1f4e87e73715bd5b2bb390896d9d2
Merge: 1966dc6 5feebc9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:45:53 2011 -0800

    merge with trunk

commit 1966dc652fa86ea68b7eebd9b339d25fa3896b90
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:43:22 2011 -0800

    fixed zone list tests

commit 64a72045a594e531e78a2e3df923abcc4d75d5a0
Merge: bd77a81 c5ba13d
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 b5a4bb8290486dc6288a50ec21e16a629ee711a1
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 14:42:01 2011 -0600

    Finished flavor OS API stubs

commit bd77a81116f26791b49e3b3cdddbe73d640d4030
Merge: 527dab3 fe0c24d
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 fe0c24d616db5c527eb45ec88a7ea42d8b3cc866
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 348b51d040140f810cd635792280ac6fcfaf8a1a
Merge: c103174 527dab3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:23:28 2011 -0600

    Merge from trunk

commit c103174bf97af7e4413ad2ee347ffb6ebaae7962
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:23:20 2011 -0600

    Move the ramdisk logging stuff

commit 527dab372162e7ac44f67b049e2ab4e2d24f7040
Merge: 30af1c1 7334a4f
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 5feebc98f661a5a21bb8df0b417ddb5bbd2bb0e5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 16:18:03 2011 -0400

    fixup

commit f7c24a497e4838e6cfb6d4924a1e88636bb423bd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 17 12:12:19 2011 -0800

    zone list now comes from scheduler zonemanager

commit e4b88ba1c42a8af3a02e044c3158f5b5e93dc8d9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 14:10:08 2011 -0600

    Stop blowing away the ramdisk

commit 107de379a6dfc28d9d1383acb09829fafd12852b
Merge: b38eb21 f6474ba
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Feb 17 19:49:48 2011 +0000

    Rebased at lp:nova 688

commit 30af1c1327b48708127d301ffd4d65e69ba49119
Merge: 6e8a902 7d9d1a2
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 6e8a9029d196c2b737910dd070e5238acb051957
Merge: ed1bef4 f812550
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 ed1bef45fc619a318fb9f6bb85325baded650b39
Merge: 21c7415 4d6781e
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 21c74159ab5fdf37c9f678805040c2ab16bd9205
Merge: f6474ba e37b9a7
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 45b1b9b901ea0c8755e799ea519cec4d41a937d5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 17 13:28:39 2011 -0600

    Foo

commit 4d6781e98867dad1491ce42494bfcd06843d9f53
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)

commit a76aefca49187f1f5d13164f47627392fe94ff8f
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(+), 0 deletions(-)

commit f6474baa045a97066076ef439d4eebde145c7d3a
Merge: f461514 7f219c7
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 f8125507ea2973e85a20ee9995753a3df7aa2b7a
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Thu Feb 17 12:13:20 2011 -0500

    Switched mailmap entries

 .mailmap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2e9bf1443a2ee19019c6134c73020f0f5cc5570d
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

commit 634616421f0cacbc0d612cba4b7ddd09badc9a8d
Merge: 836a68e e6fccc1
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:52:43 2011 -0600

    Merged kpepple

commit 836a68e0c5f015d5dae7a37a2a9145938588f0ec
Merge: 0f85456 f461514
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:51:33 2011 -0600

    Merged trunk

commit 0f8545612380221f0432290454c6b952892c3e45
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Feb 17 10:50:49 2011 -0600

    More testing

commit 33e6d3b870781e53b58768aa862f815fa05846e2
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 17 22:01:21 2011 +0530

    Block diagram for vmwareapi module

commit e37b9a7c69376f092885bad0b8d50b04a59722d5
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 17:10:51 2011 +0100

    added entry in the category list

commit 9dcaff5453c8676803cbc603020b75e92c98edda
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.

commit 7def2c734ab56ae032129a4f6d266a545dcb0057
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

commit 7f219c7f945a4bf7386fe2031bfe8fcbd6d9837c
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 16:46:55 2011 +0100

    added more I18N

commit c6bb8c56f6dac07e580d687a9342df45fa596159
Merge: 6ae8e2e f461514
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 7d9d1a21ef655453276fd10908df3732e6903fc2
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

commit 7642f94bc5310c76e018d6888254b478b37f8d7b
Merge: b38eb21 f461514
Author: sateesh <sateesh.chodapuneedi@citrix.com>
Date:   Thu Feb 17 19:50:55 2011 +0530

    Rebased at lp:nova 687

commit c41e01bc60da96df2bba52ff8eee736a4c2a5919
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Feb 17 15:14:45 2011 +0100

    added i18n of 'No networks defined'

commit c5ba13ddfbc2ad4151f9d0a8ffd10203fb21e6b6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 17 13:46:24 2011 +0100

    Make eth0 the default for FLAGS.public_interface.

commit cea9f17530e024271d389c62984c6c43a3736db9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:58:42 2011 +0000

    Typo fixes

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e2f31f6fd5f732223fa08bcd164b465fe2d0e86b
Merge: d339422 f461514
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:30:51 2011 +0000

    Merging trunk

commit d3394228fb06236be34c7705b67e6dc3665562a4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 07:29:50 2011 +0000

    Adding tests

commit e6fccc1907ee825510acfbf22ce2b5753229b9e4
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 16 23:02:24 2011 -0800

    first crack at instance types docs

commit e26483f48e610db38eaab7b1786153db42c86e78
Merge: 15563aa f461514
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 21:42:22 2011 -0500

    merge trunk

commit f65010bb4825408525ed01068c3daf004ec064f7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 18:35:43 2011 -0800

    style cleanup

commit 58b998584744829a19ecb677a48b76c516baad1f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 18:30:56 2011 -0800

    polling tests

commit 1fd570af633da3466986d84dcb578d55cd9d81db
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 17 01:24:31 2011 +0000

    Use glance image type to determine disk type

commit 60f4430de6a66b333b3160962335ea62a9b3879f
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.

commit f4615148c72065f908c9a5c2b5704f3ece20c4e4
Merge: dd09565 ad70e54
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 50d0bca5c98e4b14973aa277b931f5878ebfae3c
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.

commit 1c334f5e2fe242ef726a1a3dae79abbf66f5bc62
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 17:51:43 2011 -0600

    fixed

commit 6f758033e16bfaaea8ebd9d3867c9c64e941ce5d
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:39:12 2011 +0000

    Pep8 fixes

commit 15563aab71a62fc96300c515c0dbacf717e0315b
Merge: 5a23e1a dd09565
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 18:33:38 2011 -0500

    Merge Trunk

commit 91c6836cc6af95e86932632f8c0f712ecfb06854
Merge: d9455d5 dd09565
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:09:08 2011 +0000

    Merging trunk

commit d9455d5f629097ef93ec5e7b115381a257c18ca6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 23:07:43 2011 +0000

    Adding basic test

commit 9c7618592e72cf9d382f6c6838791e66052b80c7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 17:02:57 2011 -0600

    Better exceptions

commit dd0956529ad1abda61a35a640ba159f779f0b33e
Merge: 7707a30 ccaea7a
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 064359c89d710cc6725249cdc0c782f8bc69deea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 16 14:15:41 2011 -0800

    add periodic disassociate from VlanManager to FlatDHCPManager.

commit 6ae8e2ec6b5e4215bf365a9f5a85d2839bf3a10b
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:40:40 2011 -0500

    Flipped mailmap entries

 .mailmap |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7707a30237a797ced77d14829c04707645cb332e
Merge: b3256cc 89373d5
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 2c84231455ad291c6952e0e97e045f31c0e90fbb
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:22:16 2011 -0500

    Accidently removed myself from Authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 540dd009763fa86afb80859178b44a6162e28ebb
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 insertions(+), 1 deletions(-)

commit 0e1f7ea8864e8a6dde02803862ddd1b6f9746140
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 13:17:42 2011 -0800

    zone manager tests

commit eb6e6b2c25b4b3bc8440dcadf322aa99fd678fb4
Merge: a83f4fc b3256cc
Author: Brian Lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 16 16:06:47 2011 -0500

    Merged to trunk

commit 679174a71f9705a82eb6c50a655d736f69ae1a2f
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

commit b3256cc304ddaf813f2d47556ce0da403f0deb75
Merge: 0b5744d cc99d67
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:12:48 2011 +0000

    Use RotatingFileHandler instead of FileHandler.

commit ad70e5496129a3e6f9f51da58dc1629743eac3e2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Feb 16 12:03:59 2011 -0800

    pep8 fixes

commit 186b2025be2b9a63960d43e3b50351bc01a3cf97
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

commit 0b5744dfa5d1faa01bb29daa6d8ef484acbff120
Merge: bda15ca e4baf35
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 b44a3978d1b40f132e33239ce053446b933a2f97
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:53:47 2011 -0600

    Typos

commit d333d4943d58f4fedb959e096340ae2eefa37997
Merge: 61eb522 bda15ca
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:49:54 2011 -0600

    Merge from trunk

commit 61eb52205b2aa27ddd0c3f3fc05fa7a9e74cffb6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 13:47:14 2011 -0600

    Derp

commit e4baf35325c75b267534fbd83e99c6ddc5b75571
Merge: 2817dcc 9bc1f2e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 20:34:30 2011 +0100

    Merge trunk

commit 2817dcc1d177cfe36c38c407d027c6026a24cb7c
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)

commit 3560344e85d4b750a68ae4ab9c1ed3ecb1abb711
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Wed Feb 16 19:32:45 2011 +0000

    Fixed merge error

commit 1c6d858767374a56c22451937686627cbb9e3257
Merge: 24a8e4d bda15ca
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Wed Feb 16 19:20:51 2011 +0000

    Merge trunk

commit f0dd91cc7464b2031882c7990edd74131a184f93
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 11:05:03 2011 -0800

    novatools call to child zones done

commit 5f8bbdc73fd2b18a55a612882535a14b383cdfbc
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Feb 16 11:04:48 2011 -0800

    novatools call to child zones done

commit 1d627357093fa9e997ef030854434ae64721cde7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 18:43:55 2011 +0000

    Putting glance plugin under pep8 control

 run_tests.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 89373d55bc02262c46117b758b5dca0fa1ca627d
Author: Brian Schott <bschott@isi.edu>
Date:   Wed Feb 16 13:24:46 2011 -0500

    fixed authors, import sys in migration.py

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit cc99d67cece2195cd4fab2fe2ee65690896e2904
Merge: 284c30a 9bc1f2e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 19:09:40 2011 +0100

    Merge trunk

commit 5a23e1a0f1c57d9ffef358db0528f4ae9faadeb5
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 12:49:04 2011 -0500

    Merge bfschott's patch for migations in.

commit 50fdc50a8bd1b88d78c86bb135b62508a0dcad6c
Merge: a9d1e00 bda15ca
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 16 11:21:50 2011 -0600

    Merged trunk

commit 6bb62711274476f9e58b0ba1cc7089e0c56c4ae0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 16 17:16:31 2011 +0000

    First commit of working code

commit a9d1e003f207a29dc413fd1cb272500436a166e5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Feb 16 11:11:49 2011 -0600

    Stubbed out flavor create/delete API calls

commit 1112f8b89778a6857be727a18a059842d019f400
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 ''.

commit bda15ca1060b860ab816eb779ee422614eaf1378
Merge: 9bc1f2e 27c358e
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 b07b739fe01127a9e1ba7aeea0d18e10eb726dd0
Merge: e2d0091 9bc1f2e
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Feb 16 11:04:17 2011 -0500

    merge trunk.

commit 6cfa7adaebb03354086bc9632b1bf9defd2a818e
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

commit 4f58978b1448899b9427571bbb48cd60c09d8c3c
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

commit 9bc1f2e90ca29ef9fb1c2cfb7b6d2e21e5584cf3
Merge: 15a00b3 6f18787
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 6f18787188fde73a284e78101920061b02075a1c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 10:46:59 2011 +0100

    Fix PEP-8 stuff

commit 0d45d3d00fcd281a35d311dd27c38ee5a0276e4f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 10:02:17 2011 +0100

    assertIsNone is a 2.7-ism.

commit 15a00b3a39c297b545152b252342735e065eae98
Merge: 7551128 1a7a860
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 1a7a8601af7f4bfeaee1f5670084dd7ccbc44ff2
Author: Vasiliy Shlykov <vash@vasiliyshlykov.org>
Date:   Wed Feb 16 10:13:52 2011 +0300

    Added myself to the authors file.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 788f3dec58cd5ebe171c685bcf3f384fd0fc94cd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 00:14:26 2011 -0600

    I fail at sessions

commit 0628a26e625c6dc6e73552b25507e36a8794e869
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 16 00:06:29 2011 -0600

    I fail at sessions

commit ec295e140b08c305fa6f858cdd684451cfb230bf
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 23:56:00 2011 -0600

    Foo

commit a08d25ae3b686fb0a886729958838c7aad279695
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 23:10:29 2011 -0600

    hurr durr

commit 02f5cfb5b9ee7274b2702404e0b4a96deaed0059
Merge: 82bda50 7551128
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Feb 16 02:44:37 2011 +0000

    Merging trunk part 1

commit 7c964dea15574a825bf2ff05774853330043fa89
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

commit 541a00afc207f237f1d1d8d38474e91ef4518a0b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 18:02:57 2011 -0600

    foo

commit f55d18a7cf13820c324b59189a0a135f424988a9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 17:58:57 2011 -0600

    foo

commit 82bda50490734038b9296d317771915b94a05ccf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 23:36:23 2011 +0000

    Adding vhd hidden sanity check

commit 80e1bf1fcaf0a426acd4c45ca5f5ae6f35fc12d8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 00:19:16 2011 +0100

    Fixes 718994

commit 92a787adf91c6fdbf3eb7da1c014253b7fbf22ed
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 16 00:10:17 2011 +0100

    Make rpc thread pool size configurable.

commit 7cc79d9c12c1e6b2bc04588e9f10176d0efa847c
Merge: 17a061f 7551128
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 17:06:22 2011 -0600

    merge with trunk

commit 93390824b70a675e0775ae478700b0973884a5a5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 16:46:17 2011 -0600

    fail

commit 59c445ff5f1644ab2e419c090368295d60989557
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:41:27 2011 +0000

    Fixing test by adding stub for get_image_meta

commit 755112870df40d23d8bae904a1f5b351c0291f7f
Merge: 8932190 5d43371
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 c72bc7f5827b7c13ab48a789acaa6f47091e510e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:31:51 2011 +0000

    More pep8 fixes

commit 2ede4831e886d8301c566797c612436590aed7d9
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:24:48 2011 +0000

    Pep8 fixes

commit 1851f521968b9a74b45f0e6b681f8b5c602328aa
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 22:19:58 2011 +0000

    Set name-label on VDI

commit 284c30a83d47dda5cad8360e0202346a5313c259
Merge: fbb12c5 a5ddb51
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 23:15:03 2011 +0100

    Merge

commit fbb12c52876209204a327e555012e77846492235
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 23:13:25 2011 +0100

    Don't hide RotatingFileHandler behind FileHandler's name.

commit 3eaf1836642776e594836e499d4f8fd3b9059e51
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.

commit 149e4cd737f866b2d55de59a3fbe10eeb25dcd9a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 21:54:42 2011 +0000

    Fixing typo

commit 5c69f63e3cee588c6362d9e3cb19fb5409be3f8f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 13:40:54 2011 -0800

    polling working

commit fd251b08dd1463a461a51231258f431c284580d7
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 21:36:13 2011 +0000

    Using Nova style nokernel

commit 5d43371d9df3415777c29fbf292e796fb90084c0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:30:44 2011 -0600

    changed d to s

 locale/nova.pot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 17a061f30a6b44879144d0c3dfd3f24bf40d2e9c
Merge: aa1e02d 8932190
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:27:59 2011 -0600

    merge with trunk

commit 10a18cdd8e531cb7e9187d7b4d1ad970f91f23a1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 15:27:23 2011 -0600

    More plugin lol

commit aa1e02d7da00b67c0e8d6240063542afa3f19831
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 15 15:25:48 2011 -0600

    moved reset network to after boot durrrrr...

commit a5ddb51a306e4a0ac6cd4a2a0aa6421af055130c
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 22:13:08 2011 +0100

    Don't hid RotatingFileHandler behind FileHandler's name.

commit b2117520e203c7701b7700787fdea65af0dca707
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Tue Feb 15 21:38:47 2011 +0100

    removed flag --pidfile from nova/services.py

commit a83f4fcf67aebdcac3e3f37204665f60e71df456
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 files changed, 1 insertions(+), 0 deletions(-)

commit fa932a5228f9500274e30fa432fa99f631004eb3
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 14:29:31 2011 -0600

    plugin lol

commit e2d009167a6c93bff52f8b7f18da1f28e0478828
Merge: 6953b7d 8932190
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 15 15:22:11 2011 -0500

    Merge trunk

commit 00d84ee267cf000c8a87904016670a11729b0381
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 14:10:43 2011 -0600

    Plugin changes

commit c8628ed1076ac29403e496242ead74f711775978
Merge: 42f2004 8932190
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Tue Feb 15 15:01:41 2011 -0500

    merging trunk back in; updating Authors conflict

commit 8436f5e571cd3a8bf6cff3aead3bdf92cc416b40
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 19:51:23 2011 +0000

    Adding documentation

commit 6b39510312024450ff14099c9060f41223d9c74f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 19:17:27 2011 +0000

    Regrouping methods so they make sense

commit e297f8a1785a2bd8d825cf625379ce2304cc9dd2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 11:15:59 2011 -0800

    zone/info works

commit 9c95550b9184698d0f229b7898bd22841544730b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:50:40 2011 +0000

    Refactoring put_vdis

commit 955c77462dcd3e2b343af8ac1979407ab27a7403
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:36:17 2011 +0000

    Adding safe_find_sr

commit 53fd18af91f62305e9267ca079c806cc8ebbd357
Merge: 084ba0f 8932190
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Tue Feb 15 13:35:41 2011 -0500

    Merged lp:nova

commit 8932190b1420eaca45d0522621704c1fabd9a29f
Merge: 4bdbdf3 ee37a75
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 90c2d9c205402e49f50efe097810773480a6ac47
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:23:14 2011 +0000

    Moving SR path code outside of glance plugin

commit 4bdbdf3bb9c96604fce8ef2e6a0b573abbed4426
Merge: 88a57a1 293be71
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 e0c0a7ce902fbd0b8e61d8461f7203299deeeb96
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 18:01:13 2011 +0000

    Adding more documentation, code-cleanup

commit 4b26d8cb2692d084827add5c3a8d20b818ffd4c4
Author: jaypipes@gmail.com <>
Date:   Tue Feb 15 12:39:17 2011 -0500

    Replace placeholders in nova.pot with some actual values.

commit 88a57a163056d247277237ab5068c2c2c0d0c163
Merge: 9efcc48 bc9bc89
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 9efcc48b4152c2a7eb93271f3ed6198e29c5e97b
Merge: a918505 ba0a527
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 a91850509095bb43448d8fae0b2331a443580161
Merge: 11f8b1c 17a1259
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 a35d27c7330f6c1dec82ed43e364c559d6426c26
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 11:19:27 2011 -0600

    derp

commit a309d98e5d97f24c8c2069fd968e4d81a34adb1a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 15 11:05:20 2011 -0600

    Better host acquisition

commit 2396817ff4bbf792d453a690a9febc60d4e2d87b
Merge: 9eef64e 02fc45f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 12:44:54 2011 -0400

    zones merge

commit 02fc45f6ccfe3c198e598bd996ad7c352faa2ee1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 12:43:29 2011 -0400

    fixed / renamed migration scripts

commit b6dee26b33b24427d6551c5d10884a475e41fd2c
Merge: f7e120b 11f8b1c
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Feb 15 10:22:17 2011 -0600

    Merged trunk

commit c8add14bc73b4b33d91e0f4cf3189934b224f53f
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

commit a1d10a86087c402cf48d8837c34bcba6625cd420
Merge: 178afdd 89eddbe
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 178afddf1a462c8d86f7965051e17405e46016fd
Merge: 11f8b1c ff5ca9e
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 11f8b1c892090274b2e9f3514000e8a078cc75b0
Merge: 387d131 1f45b98
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 15:09:52 2011 +0000

    Fix sporadically failing unittests.

commit ee37a75199f2f34483dd5028437b517e2818ca99
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 files changed, 1 insertions(+), 0 deletions(-)

commit 8954ac9f661f0574a2a2ed4e271313e5b2927a93
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 files changed, 1 insertions(+), 1 deletions(-)

commit a5a2b7b209667bb42a7f6d37ff01e6a043da9edf
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 deletions(-)

commit 387d131c48ba290d664fb6b2207d917394331272
Merge: 42369ab f76572b
Author: Dan Prince <dan.prince@rackspace.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 9eef64ea5a6faaf2f3a4d3d138bd65fd8ea3424e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Feb 15 09:48:47 2011 -0400

    initial

commit 166e234c2815ed453f9c85b739b7e4f471ec8544
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 14:02:19 2011 +0100

    Naïve attempt at threading rpc requests.

commit 1f45b98df16e00e504dfdcaeb8d33c576e946f9e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Feb 15 13:18:27 2011 +0100

    Beautify it a little bit, thanks to dabo.

commit 24a8e4d19147c27c634233a1ecd01d20e68e6b0b
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

commit d607cf78233b15e168652b557f0de4491a8d07d0
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.

commit 331a1d00b89de067388340135f858a9d9c63e805
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 23:58:21 2011 -0600

    Tons o loggin

commit 04109f36f341fc4900388c04b6ecc99b1ce7fd09
Merge: f7e120b 42369ab
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 14 21:50:13 2011 -0800

    merged trunk

commit cf75e332964f9effb465cba0a5c1bbf151a418a7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 23:22:37 2011 -0600

    Refactored

commit ff5ca9e323d316d2706b28ab74843c2ebc538150
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 files changed, 1 insertions(+), 1 deletions(-)

commit 5c1ba98183ebfc7130365699ec67f2a19db4455f
Merge: 83581fb 42369ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 23:06:56 2011 -0400

    trunk merge

commit 83581fb99275ee850409a745bb4c46bdf9bd9534
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 23:02:26 2011 -0400

    better filtering

commit 6162a05da616719909ec2b67cd1e7d892e56e385
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 01:37:54 2011 +0000

    Adding DISK_VHD to ImageTypes

commit f76572b7afad43fc8b2ff90b96e421aa2f475550
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Mon Feb 14 19:51:51 2011 -0500

    Updates to that S3ImageService kernel_id and ramdisk_id mappings work with
    EC2 API.

commit 51c8747e9ce64c150128e1b6e465762d0ed234ab
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

commit 998a557f0b86a8beb7a31decbe0224e4050602d9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 18:04:07 2011 -0600

    plugin

commit d22ab7819ac68bb261baafe07396bb4493eb86e2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Feb 15 00:00:56 2011 +0000

    Removing testing statements

commit 42369ab6804141730a71b63fb358ce3713e6897c
Merge: 79c9b56 dc6a6c6
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 395307dfef770ca65d7f8cbc8333e558c80eb9ee
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:34:54 2011 -0600

    bad plugin

commit fcac82c7958060c9aee5ffa9240b41d219b2ac3a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:31:20 2011 -0600

    bad plugin

commit 69d633868d506f94eff7167653fb57ab95fe7fc8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 17:24:33 2011 -0600

    bad plugin

commit 59aa2c1434c42aad994f08d52fd81217974ac4b3
Merge: 114d68c 79c9b56
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 17:18:59 2011 -0600

    fixed merge conflict

commit d1d0e2c18d127d30c433b93b82614979cf30ace8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Feb 14 23:12:34 2011 +0000

    First cut on XenServer unified-images

commit a8d4ac47ff190d19e838ee10f9a489a2af2dfe08
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:54:04 2011 -0800

    removed debugging

commit 89c9bd67690728db36013b2448b7fc737253d4b1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:52:58 2011 -0800

    fixed template and added migration

commit 1b9ae9667b8a339d9d6d26c50f11381b2f494cbe
Merge: a24155d 97856fd
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 14 14:50:29 2011 -0800

    better filtering

commit fea3710beb0067d6d642689dcee508ff407ef60b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 14 23:27:31 2011 +0100

    Use RotatingFileHandler instead of FileHandler.

commit c5c838170cfd5bee6d0ac0c9cb0994542069cf1f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 16:24:51 2011 -0600

    Typo fixes

commit 8e92c7aa1829cc1af258e29c91d2c1a1c99fa703
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Feb 14 23:19:15 2011 +0100

    Resurrect logdir option.

commit 3a5fee172291ba45655aa8a2519b94335d1a21bc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 15:55:52 2011 -0600

    hurr

commit 02c8357ef4b2763825739f74a4fd51c425854883
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 15:26:08 2011 -0600

    Some refactoring

commit da44e80ec4fd2f006cec0d3acdab75cf9fc711a4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 14:40:58 2011 -0600

    hurr

commit cdaa3a8c1a37fce6fa0ec1a4ce32b6d8429425b0
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 14:25:00 2011 -0600

    Snapshot correctly

commit ddad59562bbffb0dfae85b2a44570cfc83f5c5b4
Merge: f036aee 8a964fd
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 17a1259a61c0d999c1520e9964dbec9477d065f8
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.

commit 79c9b56742e4322dbe3024700a032ee84d6ea490
Merge: 97856fd 63863e3
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 83f6b89fbdb3a8fc558703fd574b53e15c7a2a4b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 13:50:06 2011 -0600

    Snapshot correctly

commit 0e4b1a962c1e1c73ab7b0b807034e2da709eec12
Merge: 6293239 97856fd
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 99ab3e120d53fbea8733a52c9dac2242d21e5c68
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 13:38:05 2011 -0600

    wharrgarbl

commit 62932399eade39cb9c4636085db6597d395a4acb
Merge: 73b7812 4638817
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 f7e120b567045473073f58f3e5f9424aba449962
Merge: de3255a 5671517
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 114d68c7e37572ab32fdd673edf45dfb591dfbca
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 12:59:46 2011 -0600

    corrected model for table lookup

commit d2593b7254c94c82838975ac3afdd42d12a60c7b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 12:50:54 2011 -0600

    More fixes

commit 6e3511f2243149eac1365749f33bbaf94eeb3483
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 14 12:44:07 2011 -0600

    Derp

commit 27c358e0a4eddafeff2f76ec53d0a9f7a0b448e5
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

commit 81a0ad5cdd55d639b4ca71409fa43ba25e4a0516
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

commit 7334a4f617b67bd923eaa6a9e542d45847b4cd9d
Merge: 22ffebb 97856fd
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Mon Feb 14 17:48:38 2011 +0100

    merging with trunk

commit 22ffebb6594a5d4e58297ee94e1bd7d5576ef1d1
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

commit 5671517713a8ff6c3789f1216537284180f0156d
Merge: 1de4b8f 97856fd
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Feb 14 10:38:29 2011 -0600

    Merged trunk

commit 1b45ca27cb1f1250abba64a308c36ad63d6b99ed
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Feb 14 10:21:16 2011 -0600

    support for multiple IPs per network

commit 89eddbe0c9697c0e217092dfe9a86722489bb924
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 -------------------------------------------------------
 setup.py        |   12 +-
 3 files changed, 10 insertions(+), 2134 deletions(-)

commit 53a925cd07598cd56d9960a9cef05fec781be31e
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

commit a7bfec5833cfe41e200b973885b02065e0a6c6ee
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.

commit 97856fdefd1aff9834bb7f340a6244cc12073ed6
Merge: beb32b8 8c89fbd
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 dc6a6c6ffa15aa8e550d58cb03e793eee9b7c074
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

commit 977eb4c2feda3061d03b9c5683d10a2158e320ec
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 files changed, 12 insertions(+), 12 deletions(-)

commit beb32b83cfea430de1681234d2725d249858157a
Merge: bf6dbff d7bc3b2
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 bf6dbffb42bd180af6dbabce238b96e6e5c81062
Merge: a176812 a70853d
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 a70853dfcd23748a0614f2341e491bc12a44cdd0
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

commit a176812e4c3c56f672fee6045740c281a0d7ecb8
Merge: 6535c17 0e2cc90
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 8c89fbde71bb5c154b6a7d3ba75c7a98cfa1f97b
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

commit d7bc3b22deb6f5a5499b1d5c1f250250cca7cd64
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Feb 13 10:45:20 2011 -0800

    fix typo in auth checking for describe_availability_zones

commit 0e2cc906af745142f83a711db6b8e501b662e8a8
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Sun Feb 13 19:34:20 2011 +0100

    now sorting by project, then by group

commit a4230e3f0f27223c9837a0567676bcdca8985328
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 files changed, 1 insertions(+), 1 deletions(-)

commit c274467450ccb7a2fa93c9e099ecbaabe834591a
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

commit 859c731d5862356bd6b94eb7e5a21a8ebdb90202
Merge: b2b5ee9 6535c17
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Feb 12 18:34:36 2011 -0800

    Merged trunk

commit b2b5ee9b5e33611caff5d0c5f30ec3e99bc0b798
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

commit ccaea7a7884a47f535d6420e563ed1d7c125a0c0
Author: termie <code@term.ie>
Date:   Sat Feb 12 13:30:31 2011 -0800

    fix :returns: and add pep-0257

 HACKING |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 6db24b3a9827a3ccbced89f5f34c1c9ebe058cc1
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

commit 82cdd027c63d0e31bf211cf9649aeddd055ccaed
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 files changed, 11 insertions(+), 11 deletions(-)

commit 3faf3a0387beac5680f443994c67334769fdd8bd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:12:18 2011 -0600

    More typos

commit c97695d713bbf111d75b98459b683bf677ea29d1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:09:11 2011 -0600

    More typos

commit 2235d2d4b4dd0d1e0d3ad61c9b092b28fd9e8f65
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:07:34 2011 -0600

    More typos

commit 02e79a33b3cd214572ec9e29e2e0051a3e6dcc7a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:05:02 2011 -0600

    More typos

commit e6ac8c248f87d1b8fe687019f439702617abc980
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 18:04:00 2011 -0600

    More typos

commit 8a964fd626f5701d99cd54f8a7996fcfea4b9c2a
Author: Brian Schott <bschott@isi.edu>
Date:   Fri Feb 11 19:03:45 2011 -0500

    fixed exceptions import from python migrate

commit e5aedf6abe978606337f309765f3544ad2874403
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 17:39:04 2011 -0600

    Cast to host

commit 6535c17d088cf3fc13d4de2d1aa7e1b552baefd8
Merge: 2ffe8eb 9d66367
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 de3255ab97389cd04e110021d561f1af6ad76b49
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

commit d5a03c79c8b8fedca549c61badad41adae7529b3
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Fri Feb 11 13:53:54 2011 -0800

    updated tests and added more error checking

commit 1de4b8f2c9cf16df030894991edb2ddb32469d15
Merge: 26cf2ab 2ffe8eb
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 11 15:18:32 2011 -0600

    Merged trunk

commit 639566dc679ff31b508b4592d0b0e0c006bab116
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

commit 26cf2abcc47f0209fabc28cd110281dfa16e7668
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Feb 11 15:04:49 2011 -0600

    Added more columns to instance_types tables

commit 8f38702ce7976078ab9ab0f2f8528f7f04d9f100
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

commit 9d66367ad48d8bf8b14912f58c97adcbede8f907
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 11 11:30:56 2011 -0800

    joinedload network so describe_instances continues to work

commit a24155d916a9970a9fc33da335b936c04ff8f674
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 11 15:13:05 2011 -0400

    zone api tests passing

commit 2ffe8eb9ce08f779e6d7bb44e4ac86b90b5f1fb5
Merge: c08ec8c 70e8c00
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 11 17:54:36 2011 +0000

    Create a new AMQP connection by default.

commit 08bd57be55c9dbdc3ba8f3e402ab2c923fec347a
Merge: 0283186 c08ec8c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 11:15:28 2011 -0600

    Merge from trunk

commit 0283186bac3ad687178b5927c1a3352799863e71
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 11 11:14:51 2011 -0600

    First, not all

commit 084ba0fb8db498cd8f89e61211a43a6b33827896
Merge: 8470e60 c08ec8c
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 f4d07fd2fba3fab8f76af0cc4488f435ceb0b15b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Fri Feb 11 11:25:55 2011 -0400

    rough cut at zone api tests

commit bc9bc890d1bd62a1d4b444a93953f6f687e3a4eb
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

commit 70e8c0044ec4e39f3bde57fa74fcd934769854fa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Feb 11 12:27:50 2011 +0100

    Create a new AMQP connection by default.

commit edf009931ac3430e3fa7eee7fcf17f442dbd2350
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

commit b08d8ff32a0a0fa1428f4770c215e48152ade215
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 16:29:25 2011 -0800

    fixed destroy calls

commit b00abd218ec3ca336f050886ff7208a3cdfe8653
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 17:20:10 2011 -0600

    Forgot the metadata includes

commit 1dd576bc7e60f8afd91f0a03c52823f0d2d4b5ca
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 16:26:08 2011 -0600

    added get IPs by instance

commit 26bb6acb6171cd5dfba07dc246ac98eb0d35b65e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Feb 10 15:25:26 2011 -0600

    added resetnetwork to the XenAPIPlugin.dispatch dict

commit 8a6979f27b0a226527d147fff8543383de70323f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:06:27 2011 -0600

    Forgot the metadata includes

commit 6f711fc6a1b6f63c3c47fcc810c785a57edc003e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:04:06 2011 -0600

    Forgot the metadata includes

commit cc88cb87602b639ceeda8846318831f9dcfb7d2e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 15:01:38 2011 -0600

    Typo fixes and some stupidity about the models

commit 948abafe5fbee548c9be448bd744b9f88bacab23
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

commit c08ec8cea7b22b79a0b3099a34d9eca7bb0c115a
Merge: f036aee 183421a
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 ae6d1a4551709df035d6c5d293a040cf1735692b
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

commit 03886b6235145185b4fe56e67dfb0b28c0dd9a30
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

commit 1d953ef364d5ad40c789eb6dda583056b4455a25
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 13:59:54 2011 -0600

    Spawn from disk

commit 47d82e687146fb9c052f1a221cf7822608fd2be9
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Feb 10 13:42:57 2011 -0600

    Some more cleanup

commit 183421aae69ce5ba94254c75e2c60fd815e817bc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Feb 10 19:40:21 2011 +0000

    sql_idle_timeout should be an integer

commit ca00da0a44132951e50523f02e0450ae8e8d321b
Merge: 5d65730 edd5e25
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 5d6573063ad4ad6ea50f1d4d701a9a02240d1f8c
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 11:21:53 2011 -0800

    testing refactor

commit edd5e256e90eb0c683cb6191f4ab06632ed682c4
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 11:19:02 2011 -0800

    flavorid needs to unique in model

commit f036aee822234b6c392e848dd10a42b240d4f93e
Merge: 1dab4f5 99f3884
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 1081873fde0b950ae8afd507947f997b06077ea8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 10:28:52 2011 -0800

    typo

commit d2487eb075703f6914e8f0411862def8c72b202b
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 10 10:20:33 2011 -0800

    refactored api call to use instance_types

commit 1dab4f5f0fb57df859a5ec60789872fa94e77f7e
Merge: 4fc08d8 d9415d0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 17:59:47 2011 +0000

    Use a NullPool for sqlite connections.

commit 4fc08d89c5668b3e44a876395ed446dc847d66bc
Merge: 5b831ab 82ff802
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 82ff8027cf3515aa6a665947c72d3eaffe876ce7
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.

commit d9415d0d90b7954496ddde4f36658523467371fb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 14:37:13 2011 +0100

    Only use NullPool when using sqlite.

commit 99f388463afd40df531813790dd57fb57296c7a1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 14:31:51 2011 +0100

    Also add floating ip forwarding to OUTPUT chain.

commit 31256c136404eb023ac939607f1793206c14d7a4
Merge: ca2a9bf 5b831ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 10 08:49:55 2011 -0400

    trunk merge

commit ca2a9bf9a505b83b12322374176140700c931c2d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Feb 10 08:43:46 2011 -0400

    removed ZoneCommands from nova-manage

commit 235f038d0a5080667682da6ec443d93dabebce7b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 13:23:06 2011 +0100

    Try using NullPool instead of SingletonPool

commit bd69d6cfd2e022337ba1a2f8e5f080a8468bb305
Merge: 2fa8caf 5b831ab
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 10 12:22:54 2011 +0000

    Merge from trunk

commit 4a5ac58a6e182aabd9c30a4e6b4185495e77d165
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 10 12:49:52 2011 +0100

    Try setting isolation_level=immediate

commit 5b831abac88a7b73c201bdc0205fd369e5d1f9ef
Merge: 4638817 52257d8
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 52257d80861ec33bdcb1ed40773dbcd1c3927e84
Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date:   Thu Feb 10 13:08:25 2011 +0300

    Wrap line to under 79 characters

commit f6c3e018caf58a6bc5f76dfd368e5030a09c6002
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 files changed, 22 insertions(+), 21 deletions(-)

commit 42f2004f0a7f50e9d15c8e2334faa2b25b695a9d
Author: Brian Waldon <brian.waldon@rackspace.com>
Date:   Wed Feb 9 21:54:52 2011 -0500

    adding myself to Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 73b7812174fb902df529d7faa8daeda360e1a15f
Merge: b7b2ce8 06e20d4
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 2f3d9300d2e9e28d3ebcdbca3368d5d719d1d556
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 9 15:48:31 2011 -0800

    forgot to register new instance_types table

commit 1ba7f2e250e99d25f29b8b777196371d8b07e39a
Merge: 2f42641 4638817
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 16:40:29 2011 -0600

    Merge from trunk

commit 2f426413212ebbb3daf48532de42fea910abeca1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 16:38:27 2011 -0600

    Plugin tidying and more migration implementation

commit cda8f0d576dbb3a2f01078f64f760097d535a638
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Wed Feb 9 13:58:43 2011 -0800

    fixed overlooked mandatory changes in Xen

commit 666a48bdc4747068f67eeafae8e928613f17084a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 15:27:23 2011 -0600

    Renamed migration plugin

commit 3e42119dce122e509b4a5d919c97232347864e3c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 9 15:26:37 2011 -0600

    A lot of stuff

commit add8ca4f46e8b1d18e7e48d88e9f285a589fbea3
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

commit 46388171cbec348a7101c703f94fead443fc8294
Merge: 002d14d d738de7
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 002d14da72f28485418778def5981a75ed0b1be6
Merge: 3bc062f 1a5ff1f
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 3bc062f4625e04c6446e55e0711fa62a58b72fc1
Merge: e39adda d10bf75
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 57076197153f2ec2437e9d7f0a9fc9dd5db3199a
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

commit d10bf75a3f5e73ee6f69432559f2b5235761c57f
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 11:25:18 2011 -0800

    Indent args to ssh_connect correctly

commit 956656a366c4b55d8d6413aee2e2a87cbfc3ed33
Author: SuperStack <justin@fathomdb.com>
Date:   Wed Feb 9 11:18:48 2011 -0800

    Fix PEP8 violations

commit 8470e60a454d45a3b6a4ef5d69c78097a68f037a
Author: brian-lamar <brian.lamar@rackspace.com>
Date:   Wed Feb 9 13:36:16 2011 -0500

    Added myself to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ab3beda7af7bf21d1646d9b7d92d850f18e4b227
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.

commit ad0bb3d2bba5c9c1a44424dafa3e56345a232728
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 files changed, 1 insertions(+), 0 deletions(-)

commit 63863e372ada0085e21d81724d604d69e62629c4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Feb 9 15:39:37 2011 +0000

    Fixed pep8 error in vm_utils.py

commit cb8ff1873a60a70d25cec981db2be584c9185aa8
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1a5ff1f6d266f9be26e6a62d7fc74e8cca3c8eaf
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.

commit 2fa8caf3766111a459b3c0cf77b1d05cbeb7f8aa
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

commit 869fb8837976d19e7899f8472e9693ba127f26b0
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.

commit 0197c342d524139fe89574bd9a156ee9d26715c1
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 files changed, 2136 insertions(+), 0 deletions(-)

commit dd2397575d64210c1a7b4f84f58780168b9f7c93
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.

commit e3d8c2329cecad41ce06ea242a048afcc371aa63
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

commit f97377ccc22952fc2b1b09038349f2cfa3e20584
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 11:31:20 2011 -0800

    added testing for nova-manage instance_type

commit 0e46ac76fee17349099c2ba9a3c7ee0b85e349b8
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Tue Feb 8 11:24:05 2011 -0800

    additional error checking for nova-manage instance_type

commit 3b8934b89401131ed3ceddf99ca2cc5b57a3d0b6
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 13:12:21 2011 -0600

    Typos and primary keys

commit e39adda582aa803fba6a21d175a118a09e3e29fe
Merge: 06e20d4 75e8662
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 75e8662ca54cc746e520125f8f1aa75ba664c9c6
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

commit c3140fcb9d3e12219e492b4482b4edde742c3776
Merge: 4158b9d 06e20d4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 11:07:55 2011 -0600

    Merge from trunk

commit 4158b9d59b8feff77b831dc823af160a2e376f06
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 11:07:03 2011 -0600

    Commas help

commit 235f998f24914414eb2eaf052211487186a45947
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Feb 8 10:47:23 2011 -0600

    Changes and bug fixes

commit db6f8a4c3973cc3d0fcc3cf6ba21320ed27be827
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"

commit b38eb21931ad1a6dbb68ddda3423411c6d0cdf0d
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Feb 8 10:48:55 2011 +0000

    merge lp:nova at revision #654

commit ac39a4c491dfc024de6c8d04d85749a95c97b6c7
Merge: deb5ebf 06e20d4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Feb 8 10:39:27 2011 +0000

    merge with lp:nova

commit a9496c402acafe2fe9a79f3110ed72c9577e8d6d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Feb 8 10:14:51 2011 +0000

    Fixed pep8 errors
    Unit tests passed

commit 0657fed66623d97b93d2b63ab05d013c8362e449
Merge: 40d0e20 06e20d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Feb 7 22:15:02 2011 -0800

    merge source and remove ifconfig

commit 06e20d4744c10b4bff1498d561cefeb3177da9aa
Merge: c804c5a 5814816
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 40d0e201ad81da4d7eda30674fc9ddf657e5273a
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

commit c804c5a131b5e4f5509e9478e0be119f7e76dcef
Merge: 6305166 936c290
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 63051665046862714c4608d206656cd72ba65abf
Merge: 36a7c07 84ba6ff
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 5fa349287a08e4f8822e1a1c052eaa50373fd33b
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 files changed, 29 insertions(+), 22 deletions(-)

commit 36a7c072c776d381d14156a38872e2c7dcc8aa78
Merge: 507b54b ff996b7
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 ff996b7ded8b706d64182035587f2afa3e8477c9
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.

commit 05764adc03b9559843429506d8c495cc3df1fc64
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 17:39:53 2011 -0600

    blargh

commit 585b75fac46dc90d9e6fb721e3761009e37ce73c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 17:12:15 2011 -0600

    Some stuff

commit 5d53c7fda1c15fe87f495e1d05afcffd9383bae6
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

commit 84ba6ff82e01cd7ca77ff594da2564ee83319c68
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.

commit 4db0eb5b6d58545dc429b1aeb46222add84f6bdc
Merge: bd4d6cb 507b54b
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Feb 7 22:59:55 2011 +0000

    Merge from trunk

commit a5797b167c3b641371bfccab6b80da8a1756b159
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 16:57:02 2011 -0600

    Added data_transfer xapi plugin

commit 936c290d5c38c90f48087b980db6ce599c2929cc
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 7 16:35:03 2011 -0600

    Another quick fix to multinode install doc

commit e0183776d87d907dda6dd8c4b79a82ed6c1ce4f6
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Feb 7 16:32:04 2011 -0600

    Made updates to multinode install doc

commit 6ae7da8b17e7b4ef449534b6e631c5e7944ca0ad
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Mon Feb 7 13:32:25 2011 -0800

    fixed instance_types methods to use database backend

commit f0462114f2be6915a3a627b95e23bea2343a1374
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

commit f9484b4d5fcee13546d6e1a5ed87590cc90b482c
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

commit 507b54bdb5ee8626def4c5bb9b42221150cb78c5
Merge: d5e67e2 5adf77e
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 97761007f6ef0b38dec6e53794ef8ebd1880d8d2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Feb 7 14:46:54 2011 -0400

    minor

commit 145a1b0172fe582e6a9fd87ea9838d524f1fb8dd
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Feb 7 17:06:30 2011 +0000

    Fix for bug #714709

commit 4f93addd5314d80618ef4df1b43d783db2e414ac
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Feb 7 10:20:49 2011 -0600

    A few changes

commit 5adf77e929d970520a931480951c8a3ec57b1a44
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 15:20:16 2011 +0100

    fixed format according to PEP8

commit 5814816beecdf184b23aac462323ea55c2c021c6
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

commit fab0cefff6613fe6bd480cdd6605f31782e68dc3
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 files changed, 1 insertions(+), 0 deletions(-)

commit 887aa6dfa8a86c71ba09d5c5c99ac188f3e55f0b
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Mon Feb 7 10:51:43 2011 +0100

    applied http://launchpadlibrarian.net/63698868/713434.patch

commit 7c2b11c37b9b0b2984a2ee08a21fe46855b86e78
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 files changed, 2130 insertions(+), 0 deletions(-)

commit 1bdb1c59d2abd41bf4fbb6371814ee759c9f204e
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

commit 8ca8593841f26eaeddd43d0da2a9b3578b4523e4
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.

commit cbe567a28d6da2d5880d0b981849c65683b66cec
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Feb 6 10:56:05 2011 -0800

    refactor to remove ugly code in flavors

commit a929482fb5d157cc3c09b79a70d7730988459105
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Feb 5 18:54:56 2011 -0800

    updated api.create to use instance_type table

commit 7d943a31fabf57c34c6e3a4f26db15bebd93df45
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

commit 01885ffcb60e1376dea672f229f1317b2c64fc05
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

commit 87f4cb6b301cf559fdce9da579364af71df94109
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)

commit 3dc061f18230de0d16526557093d6128c341b945
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

commit 9cf30a4b844b8264cb5b27efc0023655c04b2487
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.

commit 7f171a2cae156e1bb6f82aa54bfe1a03eef24816
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.

commit 6d258bf7eb6b04eba32c33f48289b889b8ff2f0d
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

commit 630739c0fcda5ee4790fd76f79df6e0764376f08
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 f10e855e3aea80c924403735a446df4aae3862ee
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Feb 4 17:03:37 2011 -0800

    allow for bridge to be the public interface

commit 293be715ad651de9f64b785f0078124929badc99
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 16:20:24 2011 -0600

    Removed (newly) unused exception variables

commit 096421fa37d5beb3f4b6af4db16faea30096178b
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

commit bc46cdaab65fdf39abbf14647e6a81f65cde7a43
Merge: a6a0d04 d5e67e2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 4 15:15:23 2011 -0600

    Merge from trunk

commit a6a0d04851fdf7bd5c8b79a1102a32ccee3b4ff7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Feb 4 15:13:18 2011 -0600

    Added a bunch of stubbed out functionality

commit daac21ca7b5376177f45f1991f8034dac605fbef
Merge: b316a14 2ac302f
Author: SuperStack <justin@fathomdb.com>
Date:   Fri Feb 4 13:12:43 2011 -0600

    Moved ssh_execute to utils; moved comments to docstring

commit 2ac302ffb5df08b742b2bb6486c8d0989a7c30a6
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Feb 4 13:07:17 2011 -0600

    Fixes for Vish & Devin's feedback

commit d5e67e2b22cdc557e2c2222547f167c32fa121bb
Merge: cea5b58 d509496
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 112c18689357ba822f238eac3936244d0a23d9db
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'

commit b316a14d12c20a00d1928f376d089624937f4b0c
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)

commit d509496d919c7c8b141d858a6f1f6c5525f5a7e4
Merge: 30a4f87 cea5b58
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Fri Feb 4 11:48:45 2011 +0100

    merging

commit 30a4f87efd8cee85c8ba5242c474fcd0b82d03b8
Merge: 7c3925d f2bbb0d
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 cea5b58473b88bd2230d9876128e19b02aa16ea6
Merge: 68da720 bf0f07f
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 72bc51275705bddd3482ed3923b3933b2b74829a
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 e70af019d8377c73e1c05466d9433b1ead939c9a
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.

commit 7653464adc941587781c601387e96b03b792f26f
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Thu Feb 3 17:52:19 2011 -0800

    added seed data to migration

commit cc13b04cfa7c927ebe0e8dfd4b6ec27cad53a3db
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

commit 68da7200cf3d7748725cc219b62d5ea372939000
Merge: 36854be 440534d
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 36854be4d219e5afe86925930b1b7b7bac054305
Merge: 200edef 50a6bc4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Feb 3 15:54:38 2011 +0000

    open cactus

commit bf6a393e55c9da40c304ce21fb7e721544ce5e8f
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 files changed, 15 insertions(+), 0 deletions(-)

commit 1ac44a9e41ee2431dbf774145c5970646c9f7c0d
Merge: 626c3d0 200edef
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 2 11:38:22 2011 -0600

    Merge from trunk

commit 626c3d001e7bbd4ec60eb8471ca441aeefc73e1f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Feb 2 10:49:02 2011 -0600

    Casting to the scheduler

commit d738de7521c2a966b066792b71c957c8aaba27d6
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

commit 200edefd079af46a225e83afb2319a12bae8becf
Merge: 41f3959 b67263d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:18:00 2011 +0000

    Set FINAL = True in version.py.

commit 50a6bc4a7a89d4233fb62d437cfa0c4d3859c254
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:23:08 2011 +0100

    Open Cactus development.

commit b67263deda9468281f963311749effa71ffe9663
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Feb 2 11:16:00 2011 +0100

    Set FINAL = True in version.py.

commit e009af92cad388a897ad6913111012c8037167cf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 1 19:31:43 2011 -0800

    pass the set_ip from ensure_vlan_bridge

commit b7d164926bd637958f0e470bbf902c48f7b0ba99
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

commit 8ac49c70833d8818ea70c0a9f596fcc40303fa8d
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.

commit 602b94d69d06dd258da138fd2626bcdca53bb814
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Feb 1 17:55:14 2011 -0800

    better setup for flatdhcp

commit bd18a3ad6b54a1e18f20fb0c110e002f563b64c7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 1 15:41:53 2011 -0600

    added to inject networking data into the xenstore

commit 73ca20d97a775ca97f702de1c088a65c3cb84a31
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Feb 1 14:11:21 2011 -0600

    forgot context param for network_get_all

commit 41f3959e636c36b6bd6cbd7d6de4e7e060c79dc2
Merge: 48513e7 43dd463
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 6953b7decd58f3af5952b16ccb6d3c30bb8ce97d
Merge: 1ae7812 48513e7
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Feb 1 12:33:24 2011 -0500

    Merge trunk.

commit 1ae7812256032ceaa7ae562bf2aa1a590c839cd2
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.

commit 48513e7b1b5893d1fb57f6469197d3a98ca92b9f
Merge: 405787b 9fbf88a
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Feb 1 17:14:39 2011 +0000

    Fix for LP Bug #709510

commit 43dd4637480b1b5d7d756c74ed865ce68bd0db16
Merge: 33d2893 48513e7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 1 08:10:42 2011 -0800

    merge trunk

commit 33d289369e1ef6ef102a5c3ef9a3b0770120cf71
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Feb 1 08:09:34 2011 -0800

    fix pep8 error :/

commit 405787b1e9d4bb72957737063cb177cf07a0c1b4
Merge: 39793c8 a407659
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 3c07ffb05c5b52f51ed0c877897acbbbe73e765b
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 files changed, 12 insertions(+), 10 deletions(-)

commit 8c82092bc4b01244bf8035a17db69ce304a17d5f
Merge: a050c6b 39793c8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Jan 31 17:05:54 2011 -0600

    Merge from trunk

commit a86fe845df4eac9c3eb28b0a38a480e068f3d180
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 31 14:43:33 2011 -0800

    rpartition sticks the rhs in [2]

commit 9fbf88a8913eb4b0f995df7d7bb379424a9cd233
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jan 31 14:43:03 2011 -0800

    Fix for LP Bug #709510

commit fe18ea560158c23ab45d91f49adedc66e158f65e
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

commit 3ce3708c814a7eed24d09f65548f93de9f7e4c7d
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Mon Jan 31 14:36:40 2011 -0800

    Fix for LP Bug #709510

commit 39793c8cf40e29b1d76c27578034c85a5a3675b0
Merge: 4a91d59 5c0fd45
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 d66e82f9a57bc509a543d4d3d5c6a26853098b4e
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.

commit a42dfa167041c45c07c111d31012481fb8e79692
Merge: 802d28c 4a91d59
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 9323c4c13475b61d50ca2fc182f160fe83559cd8
Merge: 77c9c6d 4a91d59
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 31 09:23:57 2011 -0600

    Merged trunk

commit 4a91d59c9b666a3933a548918b84049cea538b79
Merge: 0521c5a edea2e4
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 b7b2ce81ebdb9b95c73f0251f0340469df9857ba
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.

commit 440534d07de01bb7651d9372348602287ea54e1e
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 files changed, 7 insertions(+), 2 deletions(-)

commit bf0f07f74c1145451d1a935958bdda377e3a24bd
Author: termie <code@term.ie>
Date:   Sun Jan 30 21:38:58 2011 -0800

    add logging.basicConfig() to tests

 run_tests.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit edea2e40b8cabeb6489c271d2dda1216b4e290d4
Author: termie <code@term.ie>
Date:   Sun Jan 30 17:01:49 2011 -0800

    fix austin->bexar db migration

commit ba0a5271fc12fb1c3ee37b0d3d413b20fe0cae38
Author: termie <code@term.ie>
Date:   Sun Jan 30 16:04:52 2011 -0800

    woops

commit 2d33a3439a78ff5c5ee407278c42e4d9f4716d24
Author: termie <code@term.ie>
Date:   Sun Jan 30 15:55:48 2011 -0800

    trivial cleanup for context.py

commit 0521c5a5edd2fbb52107b278f942dc16a25953b1
Merge: a7e001e 431f20b
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 431f20b00c264e6a006427efb7ee4bc807a992c2
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Jan 30 15:45:17 2011 -0800

    pep8

commit 5c0fd4582c2b3042934284c8504b2f19b863943b
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jan 28 22:40:41 2011 -0800

    Added modify project to ec2 admin api

commit 28f8bb8458739964affc384b107967f9c367dde7
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

commit a050c6b08c974fb457277da507ac3bff4f1a0dcd
Merge: e0d01ea a7e001e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Jan 28 15:39:08 2011 -0600

    Merge from trunk

commit 33031040d4399f4fcd3aaf7453f61edba8ce02d8
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jan 28 12:37:19 2011 -0800

    Fixed whitespace

commit 8a1332ceb54dbdce9b8036a99a11d1fef7674be6
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

commit 7a1dc2512b4d395a09494477b792c905a1f61bc5
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 28 18:40:19 2011 +0000

    OS-55: Fix typo for libvirt_conn operation

commit d52d1c2d5527c10c3f23d82961a53a36812985a8
Merge: 946d7b8 a7e001e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jan 28 09:57:13 2011 -0800

    merge trunk

commit 946d7b8242bd07b99b11b5e171540b678e1f89f8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Fri Jan 28 09:55:58 2011 -0800

    remove extraneous line

commit a40765986c9b20f7856e3b7f71f7c3f305d42d2a
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Jan 28 20:46:46 2011 +0300

    Fixed pep8 errors

commit 1bb05f8ed17acd7f58ded661eb7377d097d7ba4a
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

commit a7e001eef51cc54dda62effcfa47d4e00cd46147
Merge: c3c4070 6f4009c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 28 10:07:42 2011 +0000

    Disassociate all floating ips on terminate instance.

commit c3c4070230f92cf356b404773c169d89216b8933
Merge: c534d26 9bed2fb
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 c534d265c19598df812cc031ad1be82e80b242ce
Merge: c24e18f 97b409e
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 97b409e89160dfae0fade084687c40e0301e7da6
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jan 27 23:53:46 2011 -0800

    Fixed a pep8 spacing issue.

 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b0aec5ceef26f8395654f578fcfef34a18abcb45
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Jan 27 22:51:36 2011 -0800

    fixes for bug #709057

commit 4dd6f8f627f797cc02b5630aad0bf8a2fbde0bb1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 23:53:28 2011 -0600

    Working on api / manager / db support for zones

commit 2f1993f7735948bd9fc7b2afb7eb77d72dbaeb97
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(+), 0 deletions(-)

commit c24e18f274c7dca6f35bfce379bb9be9b9c45f01
Merge: 0e53c2d d105494
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Jan 28 03:09:46 2011 +0000

    Adds security group output to describe_instances.

commit 0e53c2d0bb06a6df13b55066bd9e30010fd1d48e
Merge: 640436e a80a476
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 6f4009c58b756d890a0a77c5cc346a7c87e1cc36
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 16:26:15 2011 -0800

    simplify get and remove extra reference to import logging.

commit 640436ea1166ae1adddf64dd881b8b918db55d9e
Merge: aa0c98c da7058e
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 a80a476c9ae625b2a2d24ebc4b652db31ce5c424
Merge: 5e36b35 aa0c98c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 15:58:22 2011 -0800

    Merge & fix conflict.

commit da7058e0727c8067a8b244e00b4b58ed39c26ee1
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 16:54:59 2011 -0600

    Made changes based on code review

commit 9bed2fb3f93cb9351eb005f16ebbf1bee0cfc921
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

commit aa0c98ca641c37d7f064a2503b0e6c14f812a10a
Merge: 2bd1533 ec83e2d
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 24194f6bbf7b83acab21d5a94cf24360379f20bf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 27 13:48:19 2011 -0800

    remove all floating addresses on terminate instance

commit 5a0bb1f048c749685aadaee2c90635d823735f79
Merge: 6ac56c8 2bd1533
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 13:55:25 2011 -0600

    Merged in trunk changes

commit 6ac56c85f1befd81b9a08d6a0b0fe8f4af5545a1
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 13:52:10 2011 -0600

    Fixed formatting issues in current codebase.

commit c2fa09d13d2fb3fe50d686c6856c8251042144a8
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 27 12:52:55 2011 -0600

    Added the test for localized string formatting

commit ec83e2d0f982589fa2e585f404219c48354f9655
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.

commit 2bd15335225c8c0f6563927f6a77002b289c8c9a
Merge: b259fce 8aaca60
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 b259fce73469aac30402e2e6fc720ae6c7b6fbc8
Merge: eaf9056 f4623ba
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 8aaca6092024c9f85cb127a979a6a18e7fda9a67
Author: Jordan Rinke <jordan@openstack.org>
Date:   Thu Jan 27 09:43:25 2011 -0800

    Fixed spacing... AGAIN

commit eaf905605a6248ff8c1e0ae6b1eef31cb810531c
Merge: 01fe86f c96d66d
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 01fe86f3ba1c23fc8183de7dd90de6f50456935b
Merge: a4f9533 1492f27
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 a4f9533fb5dec91c301536c91c676bf05bd6cf60
Merge: 5732ca6 e9af42b
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 17:00:46 2011 +0000

    Missing import in xen plugin.

commit cca23d40bd2aa212d83eece0d4620ce66c72a5ea
Author: Jordan Rinke <jordan@openstack.org>
Date:   Thu Jan 27 08:48:22 2011 -0800

    Shortened comment for 80char limt.

commit e9af42b5b62b57e9f5af963703103a3a91850681
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 27 10:12:07 2011 -0600

    Added missing import

commit f4623ba861c45dd29c0b1e428e025048577f1850
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

commit 1492f27e83f51d5626ab3aee944e859037ccb082
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.

commit d10549445f9bafc27ed342703e5f089606aa19b4
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:19:15 2011 +0000

    Properly pulling the name attribute from security_group

commit 39eba05f5cbe69b3af03bbaa72caefe9cb077193
Merge: 5a43df0 bd4d6cb
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:18:22 2011 +0000

    Merge from trunk

commit bd4d6cb0d44f47f449493d26fe6af99727a19c82
Merge: 7444d92 0e53c2d
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 27 12:17:43 2011 +0000

    Merge from trunk

commit 90f98a66b7a589311be3e999f65ddd9dfb5ba602
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Jan 27 20:39:33 2011 +0900

    adding testcode

commit 5732ca68811b31c2455a12dd5b40d6cb7a0dba7b
Merge: 0121704 4d6d17a
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 0121704274dca2e970954521edec9abd95a5eac1
Merge: 95e8e46 b663a08
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 b663a08c8ad2f0f039a2a2bc6dd5a3bca12f2f67
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.

commit 4a0ac6b7684dc52c6f4c5f55ee4be654c77879c8
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 27 00:13:09 2011 -0800

    more instanceId => id fixes

commit c69b89ed706e2f09ffb2ce5d2d4a1f88b2d8ae8a
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.

commit 802d28c6b85e1aec246eaea1fb4d8766d072d6fa
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.

commit ef7e610056b77009c4acdbbe277b15dbb1dac66d
Merge: 07894e3 95e8e46
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 22:54:52 2011 -0800

    merge trunk

commit 07894e3241be20309de3ac66abdefe98b429adf6
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 26 22:54:39 2011 -0800

    A couple of bugfixes.

commit 95e8e463a7a607bebdc23fc9a285aa2a01ebf6b4
Merge: 8f8dffd 59c50d4
Author: Dan Prince <dan.prince@rackspace.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 59c50d409641e638a2f86050d8b1df45d4038c2c
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jan 26 18:34:56 2011 -0500

    Add dan.prince to Authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 72a053767a74ddbee8468037315f8478b4ab1ac9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 26 23:44:21 2011 +0100

    Make xml namespace match the API version requested.

commit c66a490644e0f9178ba897cfc92238aa893ff540
Author: Dan Prince <dan.prince@rackspace.com>
Date:   Wed Jan 26 16:12:35 2011 -0500

    Fix issue in s3.py causing where '_fix_image_id' is not defined.

commit 654d873066df831db83a8b3cc4be1238d31527fe
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

commit e91b444179e5014d7a28f3cbf6cec95a4775c4a5
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

commit 8f8dffd57a13e33b0810c6668ebf7ac03fe5cfc7
Merge: 556feb3 8af50a2
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 77c9c6da935e8a4b2f2ba6e385f9512519899dbb
Merge: 6831f5b 556feb3
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 26 10:37:17 2011 -0600

    Merged trunk

commit 6831f5b26120ece32b928648c391b7ae6b46eba4
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 26 10:34:57 2011 -0600

    Cleaned up _start() and _shutdown()

commit 8af50a2047757da63dac0a0cd60254e5e77d0f3d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 26 10:16:16 2011 -0600

    Added missing int to string conversion

commit 556feb31c0268e1ce222aeb1380ab9f1de683d38
Merge: f2bbb0d eddf401
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 4d6d17ab4647b9e9f55ee515eb016782ccdd0b2c
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 21:10:51 2011 +0900

    use 'ip addr change'

commit aca19a2fa7181f2cfad2f29fbe73aafb941f06f6
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 19:44:13 2011 +0900

    Fix merge miss

commit 98312b7a9f3fd4dac927def913b7addbb00924aa
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 26 16:58:24 2011 -0500

    Changed method signature of create_network

commit 0d0270bb85dd49b6393acd9eda29fbfa2a0608eb
Merge: 4eba4db f2bbb0d
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 26 16:21:37 2011 -0500

    merged r621

commit 4eba4db64a3b2294bb6f678061620f73727a9e44
Merge: 7ac8a8f a524860
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 7ac8a8fbef9f82f2860a5069d995d505ede8fedf
Merge: 64f7a6e f039f74
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 26 15:17:52 2011 +0900

    Merged with vish branch

commit c96d66d186789ccadabdc0dc95c806b66bd568d4
Author: John Dewey <john@dewey.ws>
Date:   Tue Jan 25 18:16:25 2011 -0800

    Prefixed ending multi-line docstring with a newline.

commit 4db59c86c07d50a7664f1a4abaf829613f87e60a
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.

commit a5c111661d13b231f93bc7ef5969c5be4a4b4874
Merge: 8881448 f2bbb0d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 17:51:49 2011 -0800

    Merge trunk.

commit e5323fd890f0aca7a2b7dd1f627b2d0ca5d5a888
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.

commit f2bbb0d6aab7a1399e2abcc2dfe74d77b5f31f6d
Merge: 1139cd8 e0781ff
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 5e36b35f6950c73942e48579217818d9e97df893
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 17:13:34 2011 -0800

    Rename Mock, since it wasn't a Mock.

commit e0781ffb2dbd627e183bbb8348f80f229b9cea09
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 16:40:23 2011 -0800

    Add DescribeInstanceTypes to admin api (dashboard uses it).

commit 1139cd81674b09e8f4aa42678c6783a416d97e9e
Merge: b0c2b5e 3741657
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Wed Jan 26 00:09:08 2011 +0000

    Fix for LP Bug #699654

commit 788215ebf4636d0f069ca48c9f1c2adae34b1784
Merge: 94ffa3b b0c2b5e
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 16:04:40 2011 -0800

    Merge trunk.

commit 94ffa3bd3c21057feeb09bb771e0e1bab2fe6724
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.

commit 374165765b05ead5385433118a794b84d0b64ff6
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 15:53:43 2011 -0800

    Fixed pep8 errors

commit b0c2b5e02f09ec830be6faf2e0dde6e358bbcb60
Merge: 931b160 ea50aef
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 7939e00f049cee9df4e15a513b7cbdbb73c660b1
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 15:32:41 2011 -0800

    Added myself to the authors list.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ea50aef23ef606724180653cf86616d9ec55e125
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)

commit 931b160a763ef88671340f727e350aabe5a00e66
Merge: 62b77eb 69038be
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 1d1f8e43994f9a6112b9b4b448182b455d40b3aa
Merge: face127 62b77eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 15:20:08 2011 -0800

    merged trunk

commit 62b77eb8226b789664977ab423ea3812979d1d7d
Merge: 68b8a7c 8ee53a9
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 68b8a7c58aaff7d1adb9a0de56e97c1048de0df8
Merge: 9bac388 0ea054f
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 9bac388f08d2ea4ad705a87de5109b5a6fbddf94
Merge: 44fe5af 768d801
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jan 25 22:59:36 2011 +0000

    Fix for bug #702237

commit 0ea054f744abaf053fd9e74774793c767520c14f
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

commit eddf401cf6fd3eeee63b44b9676e65b2b67582b6
Merge: 976b098 85779df
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 16:51:02 2011 -0600

    another trunk merge

commit 50a27d8cf088876d12d66023bb7dd2a9203e1085
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

commit 44fe5af6d9c59da8403d88135b0adb88d95e3f27
Merge: 85779df c3aafe2
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 c3aafe214dc9db2731b5146a0f51e5cf9e3710a7
Merge: 3cebf38 c19654b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 23:38:39 2011 +0100

    Merge with lp:~tpatil/nova/bug707554

commit 976b098ce44530eda65a4f2974bb2b373ccc496e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 16:38:29 2011 -0600

    Fixed up a little image_id return

commit 768d801499efa52d2c0a7f5f818620c3eb0779ba
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Jan 26 01:02:34 2011 +0300

    Trunk merged

commit 85779dff8c7f0ef55244736619328a33f4fc020a
Merge: 7bd5015 f216d2b
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 eec5b20455371682b84cd21ca4dd3bf49ac2b502
Merge: 45693bb 7bd5015
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Jan 26 00:56:33 2011 +0300

    Trunk merged

commit f216d2b623cd49b241d6b6f2705d313c1254ad37
Merge: 5b999da 7bd5015
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 25 21:46:12 2011 +0000

    Merge trunk

commit 7bd501581750c94bbe49121e3424175512d54525
Merge: bb1df20 c19654b
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 5f7e5a2062da01b395643f93ba3c006b5c42a801
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 15:06:05 2011 -0600

    moved imageId change to s3 client

commit 88814483456bd7c811f07e1046320e14e3182873
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 13:05:47 2011 -0800

    Migration for provider firewall rules.

commit d1cbc6b4fea3afc8d7692e3ff7e174c71a183f95
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 12:52:00 2011 -0800

    Updates for provider_fw_rules in admin api.

commit c57d73a72fe80ea8be3a0bd4ea74d9a08dabf8e5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 20:51:57 2011 +0000

    Adds driver.init_host() call to flatdhcp driver

commit 6446346aecd22deb88a3d8d92c6303f8877a055f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 12:50:54 2011 -0800

    Fixed pep8 errors

commit 7444d92d2cb0ba88d0cbaca0a94144478bb9b65d
Merge: 4e09281 bb1df20
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 25 20:50:14 2011 +0000

    Merge from trunk

commit c19654bd67e798f40e06efd654adae5aee95c40f
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 12:38:20 2011 -0800

    Fixed pep8 errors

commit 6fa90cfd19caa2632ea54d05f850235a985dcd38
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.

commit 3cebf38cf1ae1f4c9f5d913336ca16915cdc1f51
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.

commit 473923da3d3e764e01db61aec427b11b6c8a70eb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 25 21:19:34 2011 +0100

    Fix pep-8 problem from prereq branch.

commit 69038be11bef7d1a284ded2e2d26e64fccd9260f
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.

commit 576a7cacb206d5450c6efe55f4067477ff9c1673
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 files changed, 1 insertions(+), 0 deletions(-)

commit 20f5f95133e553b3b3654694b35e7ca5cf5e1e4a
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jan 25 11:41:49 2011 -0800

    Adds conditional around sphinx inclusion.

 setup.py |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

commit 81e4e1d47598382786f6c81e6d55a3164bad0430
Merge: 8227bec bb1df20
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 25 13:34:50 2011 -0600

    merge with trunk

commit bb1df20042c50269f441a05514ba2b7d845d563f
Merge: 0d56e2f 33be06d
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 0d56e2fad2ebfcc0457c54676732a8f7975f6369
Merge: 65b4c2e d2afff6
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 b73db81d61653ac47da513687e3e8e33f7870b3b
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Tue Jan 25 11:10:26 2011 -0800

    Fix for LP Bug #707554

commit 45693bbd1aa93a2dd22f94b7483cc964da8a9307
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

commit 65b4c2edd710b03abce9c1984c7ae26cc7fc7db7
Merge: 7767db2 24ff21b
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 64f7a6e496e91cf304f924154ed6c3df09632559
Merge: 3541a0c 04abc07
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 25 12:37:44 2011 -0500

    Merged with r606

commit 011877d5303fb93bef51e02b1541329003cd1ec8
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 09:21:31 2011 -0800

    Properly fixed spacing issue for pep8

commit d568d1134f1329cc6dc0ce10bb413194b7048dc0
Author: Jordan Rinke <jordan@openstack.org>
Date:   Tue Jan 25 09:18:55 2011 -0800

    Fixed spacing issue for pep8

commit 98d93111e81a308493df6a0b7213b55bf34efe10
Merge: 6e19b72 7767db2
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 25 09:00:56 2011 -0800

    Merge trunk.

commit 7c3925df91bdcedccb4cbed45268f3bb276c3fb3
Merge: 5f8acf7 7767db2
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Jan 25 15:33:19 2011 +0100

    Fixed merge conflict

commit 5f8acf7037cd42369f8a40bde78f70add27fc8bb
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Tue Jan 25 13:50:11 2011 +0100

    Added myself to ./Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7767db2f9ee4c2767877c28745c7efd474d0f01b
Merge: 8623320 f039f74
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 24ff21b5e8f55994b9f8f8316c4d3cb3ea809175
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.

commit 8623320e513fea6b131ce938fc06574339b0b588
Merge: 04abc07 361e753
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 a524860e3a2e29e7cf152ef8c935b2a94d8f7d2e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 00:15:23 2011 -0800

    add ip and network to nwfilter test

commit db83dfedac186145c138bf5a3da03aafe0afb0c7
Merge: f039f74 3541a0c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 25 00:14:07 2011 -0800

    merged ntt branch

commit f039f74a753d71a124d88bbdcd5e27a5699517bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jan 24 20:57:44 2011 -0800

    use network_get_by_instance

commit d2afff61273439cdf14b05b31639571dfaff70e7
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 20:16:09 2011 -0800

    Added myself (John Dewey) to Authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a303f350b08c8d8476f5fda98d1151f27a431aae
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 18:39:47 2011 -0800

    corrected nesting of the data dictionary

commit 56d62016ff9af9312f84ba27c1d8561bf914fa00
Author: John Dewey <john@dewey.ws>
Date:   Mon Jan 24 18:31:04 2011 -0800

    Updated a couple data structures to pass pep8.

commit f3669e9d64b44c90fc121665650c80666ab42080
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

commit 33be06d6800e3cd529aa7f3243f3cc175b5d10dc
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 24 21:25:13 2011 +0000

    PEP8 fixes

commit 64843205cba71675fa487ed55feda4ff8e15af2c
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.

commit 4e092818fb4dc106730d1c8552714ae2a2c4434c
Merge: 6daa5b6 04abc07
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 24 19:05:31 2011 +0000

    Merge from trunk.

commit c7831ec341faf5844aaacd0247cbd68c5d9286ce
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Mon Jan 24 19:04:25 2011 +0000

    OS-55: PEP8 fixes

commit e0d01ead008281911ce67f4d9e3660a9f82329d0
Merge: 3bde2a9 04abc07
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Jan 24 12:43:01 2011 -0600

    Merge from trunk

commit 393ace9faffceaded1734ebd0ed8a142d4d7bbff
Merge: 10ef0c7 75e26f7
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 04abc07dc6c5d6db98607ac3f7541fae9ed615a5
Merge: bf8dd50 75e26f7
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 4a4bba40532b7f5cb4c1220a4983458b15300d48
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Mon Jan 24 18:28:50 2011 +0000

    OS-55: Post-merge fixes

commit bf8dd50d9eec2de12e9002926258015714893658
Merge: f42fe05 9d8001c
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 75e26f7a070976db31324032377d9392cbc9bcd7
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

commit 953af3eae936d2681aee2c58a9a27425e17aa763
Merge: ae84091 f42fe05
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 24 11:22:53 2011 -0600

    Merged trunk

commit 361e753e0797ca9b58fffe5d8f14b796f27a20a0
Merge: c55bcaa f42fe05
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 24 09:19:51 2011 -0600

    Removed tabs form source. Merged trunk changes

commit f42fe055872519f4351bf8572b85e66a2d18df76
Merge: 266fc3e fab2dab
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 fab2dab07eb64267cd0e8fc9569c2e9058ea18d1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 9d8001cfff0b7066b8978505f6c96976d113e08e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 17:46:05 2011 -0800

    fix reversed assignment

commit 26899d6d42fe1f0873c0a8a97dc016912db34b6d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 16:20:36 2011 -0800

    fixes and refactoring of smoketests

commit 1f8b6bd339c3e41da0550c9db837fac49a8fef35
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:17:43 2011 -0800

    remove extra print

commit 83650915b188284c7eb2a8a08408f6469a8f15bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:14:33 2011 -0800

    add test and fix describe regions

commit a48df31503706eb322e959a383023df28e748909
Merge: caa660d 266fc3e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 22 15:14:10 2011 -0800

    merged trunk

commit 266fc3e0b1d0bfcdedb76a60701b1651a39d768a
Merge: dd62f57 154ed26
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 5b999da6687876680a65aefe325322db69991218
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 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit 154ed26cb0385c819143dfe1b1265543574b7fdc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 04:59:58 2011 +0000

    Skip shutdown if already halted

commit 37a56dfe2602521632c09a6183667ae0494c7ae3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Sat Jan 22 04:57:11 2011 +0000

    Refactoring _destroy into steps

commit 8ee53a9557f876288cdc823deba3ded31e6f90ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 16:03:51 2011 -0800

    i18n!

commit face1277e1c6b574ee006acc835155d5e2b071f7
Merge: 62cc833 dd62f57
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 15:53:44 2011 -0800

    merged trunk fixed whitespace in rst

commit 62cc83334af721ef0bf7f6bc6bd530b881e8888b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 21 15:48:10 2011 -0800

    wrap sqlalchemy exceptions in a generic error

commit 3bde2a9c29713e69d519427c8d44181563d2455b
Merge: 3508022 dd62f57
Author: matt.dietz@rackspace.com <>
Date:   Fri Jan 21 23:45:49 2011 +0000

    Merge from trunk

commit 843b5583f438b5a7a36482dec754b8a69cc8707f
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.

commit dd62f57a358630a469c851059ae343bc6869a8e0
Merge: d2582a0 0a5e0b1
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 0a5e0b1beb8b113b6af4aede9d5f346f87737011
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 22:16:52 2011 +0000

    Using new style logging

commit c8e51484b5d73ee6c7452e666ffb3468c9724288
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 21:31:47 2011 +0000

    Adding ability to remap VBD device

commit c55bcaabf0de74046538e7280817bc3643035f94
Merge: 3007b1d d2582a0
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 21 16:10:26 2011 -0500

    Resolved trunk merge conflicts

commit d2582a0e39a91e1b471be185144a3a9b216196ab
Merge: 164e339 7c43d57
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 19:44:44 2011 +0000

    Adds gettext to pluginlib_nova.py. Fixes #706029.

commit 7c43d57b954989935eced4634d8bcf3f3e84177e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Jan 21 19:10:31 2011 +0000

    Adding getttext to pluginlib_nova

commit 6e19b72b98d84727d89c155d53807482e93414e0
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 21 12:30:26 2011 -0500

    Add provider_fw_rules awareness to iptables firewall driver.

commit 164e3392e7f9a6500ecc8ccc37da8359653ee3c7
Merge: b4bff84 c1f4e7f
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 b4bff84fffe1db3989a419b29e905ccccf68cc65
Merge: 03be316 90a33f7
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 03be31664fb94aa3087f11c712847513ece7a349
Merge: 49d37b6 6b429d0
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 8babda2fa2cdaa9a9c997d763a06ad266506953f
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 21 16:23:30 2011 +0000

    OS55: pylint fixes

commit e23fce202af7a63822a82e562b6f5075956fcb58
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

commit 3007b1d00e34267227dcd70b3d99a798d0e32308
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 21 10:37:21 2011 -0500

    fixed typo

commit 90a33f7e6142647e6f1bc96ad5a2427ede5f3e11
Merge: 677b066 1425fb6
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 21 09:22:04 2011 -0600

    Merge doc changes affected by db sync

commit 148ad2f46429a923d4e0dbe256b967276dadaaf3
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 21 12:00:45 2011 +0000

    OS-55: Fix current unit tests

commit 3541a0c928c43ceaa90a1f356ac09cae77f3176c
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 21 20:30:29 2011 +0900

    Fixed for pep8

commit fdddb819ac5a5c0dcc1bf1e09863c5755808d04f
Merge: 549cf69 49d37b6
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 21 20:04:02 2011 +0900

    Merged with rev597

commit c1f4e7f2bb136d1b8799c9eab16b90cd3dcf891d
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Jan 21 10:08:21 2011 +0100

    No longer chmod 0777 instance directories

commit 8c4c794bd97b65c10d15f4aa699024c7cb54d7da
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jan 20 17:29:17 2011 -0800

    Reverted log type from error to audit

commit 10ef0c7d38bd88bafb9bfdc307e8b97780b4b2a0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:51:46 2011 -0600

    undid moving argument

commit 5cb44ecf6346e85f34054a96edad16ffe79f5af8
Author: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date:   Thu Jan 20 16:47:46 2011 -0800

    Fix for LP Bug #699654

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 83f8b5f33abc2c10aa9dcdb73774f064e456aa44
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:44:00 2011 -0600

    moved argument for label

commit e81a3b68fcce215de82cb55264e5dce2464e6511
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:40:04 2011 -0600

    fixed the migration

commit e75e17ceaa5480ab6afe5adaec806536b6a06e21
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 18:36:18 2011 -0600

    really added migration for networks label

commit aa813ed5c5a82f321ba656c000d975107b544d49
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

commit 77fcbfea3e793d6347c022fe58991159749d6838
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 16:27:09 2011 -0600

    syntax

commit 738ae98523dd08396e1d480aa62f6eaabad6e9eb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 16:19:07 2011 -0600

    syntax error

commit 703c78ca68527fac64518356d4952392afd82650
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 20 15:47:08 2011 -0600

    added plugin call for resetnetworking

commit 49d37b6f80aad68cb1b840b154242908098b5c59
Merge: d9c596e 974dab6
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 4635d13aae38ad0c7995b876e79947953c607a69
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

commit 974dab6dff8edadad4f1f1011319a1f4efdaed4e
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 files changed, 8 insertions(+), 1 deletions(-)

commit 1425fb6135e732075367d7ca2590049e13a8549f
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Jan 20 14:56:29 2011 -0600

    Doc changes for db sync

commit d9c596e7c2c8024b5c7c41723408773a6db7effc
Merge: 7ff345f c8e2f00
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 5a43df096fab5e7e49c48d72fdc9392b5fe1479c
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.

commit 7ff345ff7329e5cc7f86bd82b73323bd85e6c322
Merge: b74626f 9c331b6
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 8737134a0188dd4248713a5deb6e43c8e175d017
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Thu Jan 20 19:51:23 2011 +0000

    OS-55: pylint fixes

commit c8e2f00f0f17134092a8f6b3dc7d8c529e85923b
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.

commit 90e987ca163deea04fd3053e6930a1eadfa77ec5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 19:07:24 2011 +0000

    Adds security group output to describe_instances

commit b74626fe6f4b943fb93ea7d8fb42c7b194a801a2
Merge: 5c6b37c bae17c9
Author: jaypipes@gmail.com <>
Date:   Thu Jan 20 19:04:54 2011 +0000

    Finds and fixes remaining strings for i18n. Fixes bug #705186

commit 5c6b37c428c8e241bceebba7c869a55743a573fb
Merge: 677b066 3a17ab0
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 bae17c9d88b03bb564123921618480cf540f7044
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.

commit 45053f631141826db5d7d6260ed1182dc8243a91
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

commit 1952d425f064a6cffb9524c4830b1e671a02b9aa
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 20 11:37:15 2011 -0500

    A couple of copypasta errors.

commit 6b429d03ed0227aa5c687ed54659f6d422333686
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 15:12:02 2011 +0100

    Keep exception tracing as it was

commit 3a17ab05dcc4107d7c558878c28c9934b54bb848
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 files changed, 2 insertions(+), 1 deletions(-)

commit 3f28087e75237523826b5fc3fa0628d2506ce109
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 12:26:19 2011 +0100

    Also print version at nova-api startup, for consistency

commit b0c1481f2e50a638e078c4a109d6ddc79941d075
Merge: c0aa723 677b066
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jan 20 12:21:12 2011 +0100

    Merge from trunk

commit c0aa723cd3fca59bdab79afb80ec98ea6f8b3ca8
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

commit 549cf6987840ae47df6b13db41f5f48e64da183d
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

commit 2ab70cfe0d8c422da6b844653492e3f7ca9d4110
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 20 00:40:57 2011 -0800

    fix ipv6 conditional

commit 9e8206cebd47b2da9ffb9bbd7e45eefb27dee4a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 20 00:14:42 2011 -0800

    more smoketest fixes

commit 6daa5b640f8ef7f0ea13606aed1e21f45d178277
Merge: 389fd67 677b066
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 01:53:08 2011 +0000

    Merge from trunk.

commit 9c331b6ba2c975e3bd44f453c19142f44da58088
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.

commit 677b0668d1b379fa3437bb9f1780be04e35181d1
Merge: d518ea0 ff84a73
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 2cde5af63a74910094ab5124219d59633dcaf38c
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.

commit 21dc4c08779a1fc2b1e755cd0aecb2fd1c68d534
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.

commit 389fd6713d43bf6d13de1ecda033058f0fb59abe
Merge: c5295eb d518ea0
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 20 00:46:04 2011 +0000

    Merge from trunk

commit d518ea0a4681e9e137a1891d2c2b57e226a11080
Merge: cd818ca 16945a2
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 16945a2f3e38ea402cea1e9987f99e793c94c461
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 files changed, 1 insertions(+), 1 deletions(-)

commit cd818ca42b395c2ab9360c42b1380cc2d5f22d47
Merge: 6bb363d bb0c3e1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 20 00:04:21 2011 +0000

    Include paste config in tarball.

commit bb0c3e19158d284b9d40d56661aaaf5359682a35
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 files changed, 1 insertions(+), 0 deletions(-)

commit 6bb363ddcea538729684e2ad2e6430dee03fb9c0
Merge: 0cba6eb 0ca8c3d
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 0cba6ebd2ba1240a93a75622c6178a2bcc4de33e
Merge: 07c0400 329fc5f
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 07c0400dfb8e6d2d1194d460bb933b9e0177c53a
Merge: 724d88c 5800ebb
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 329fc5f63b7e6ee84ba8a2eaef8a7a395e693a67
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 23:32:08 2011 +0100

    Add Rob Kost to Authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 990c4da31fa65c5a22387038e2fc03450838528e
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 files changed, 1 insertions(+), 3 deletions(-)

commit ae840913d294ce490f62cca40f951114b03802ae
Merge: 1c3edb2 724d88c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 14:57:42 2011 -0600

    Merged trunk

commit 4530d4a2c07fe151adf12db6a52f041250e77cda
Merge: 510a363 724d88c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 12:40:03 2011 -0800

    merge trunk

commit 724d88c4481218e9da978f61c8b7723556f177b0
Merge: b93a982 5bdff4f
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 1e44890f8d4ac136205c8df39e8d468030c6a1c3
Merge: 80329d5 b93a982
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:29:35 2011 -0500

    Merge trunk.

commit 692053350aa7e3eab9d421c5da8b27d836679092
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 15:26:09 2011 -0500

    Updated trunk changes to work with localization

commit 80329d5803e6faf7d86336eefcb0d566a774ea32
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:17:06 2011 -0500

    Implement provider-level firewall rules in nwfilter.

commit 482c677bee1f5bdab4d10b442b16c434ab7e1e18
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 19 15:16:12 2011 -0500

    Whitespace (pep8) cleanups.

commit 7b9992d23e75e20c99c48f9fee33b0a6489ac3e5
Author: Ricardo Carrillo Cruz <emaildericky@gmail.com>
Date:   Wed Jan 19 21:15:23 2011 +0100

    Exception string lacking 'G' for gigabytes unit

commit b93a9824fd86185bbe309e5cb1768ba308d4eb40
Merge: 15c4c01 3e46db4
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 3e46db47959a265e4c1237340c4d4905fd10a595
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 11:20:56 2011 -0800

    make sure params have no unicode keys

commit 6e2d495117aa09bf9167d586b295b0ca6a106545
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 13:05:01 2011 -0600

    Removed unneeded line

commit 1c3edb243f4b86592ed06664086810b98f22f329
Merge: 09e0b28 15c4c01
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 12:56:08 2011 -0600

    Merged trunk

commit 15c4c01c00d1250df69776b26e57f74f444cfe3e
Merge: e550669 07fe721
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 510a363a73e71bdafce94bcaeb84b04a96f22867
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 19 10:43:50 2011 -0800

    update the docs to reflect db sync as well

commit da6fe7ec367707de2d98e63dce7517d068940010
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

commit 09e0b28c7e05fd7f1affd1aae3607ec7dbdcc65c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 11:20:16 2011 -0600

    Fixed unit tests

commit 3508022382a9e21e4c28b25ab3f4c29b85146326
Merge: 74cad95 e550669
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Jan 19 10:50:54 2011 -0600

    Merge from trunk

commit 96c5cb73b334160a9c0abbd309442523fd75a7ef
Merge: 5e35318 e550669
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 19 10:40:13 2011 -0600

    Merged trunk

commit 45b1a733d864adb83012830f74ab535139dc8660
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Thu Jan 20 01:14:23 2011 +0900

    fixed pep8 error

commit 5800ebb0d83ee5cd3fc56b0049ea7e84f7784ebb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 17:03:09 2011 +0100

    Eagerly load instance's fixed_ip.network attribute.

commit 47ae1c7c8447bef599dfbf25b8723d024f94fa17
Merge: 53b446c e550669
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 10:41:30 2011 -0500

    merged trunk changes

commit 53b446cf37e18d07a86d780951742711820bbd7d
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 09:27:53 2011 -0600

    minor code cleanup

commit 502434627ff7544e792562f68ad941a71aa3353e
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 19 09:21:04 2011 -0600

    minor code cleanup

commit 176771e750621352a83e451723b96b4a2b0fdaa6
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 23:38:52 2011 +0900

    remove blank from Authors

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 32f3d932270204a567639567fc6ebebd4e7ba785
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 23:35:02 2011 +0900

    .mailmap rewrite

 .mailmap |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e8ae4743f8490ef620ab72f9bffec7470716cda7
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 deletions(-)

commit 07fe7216cc7f298439bb5a6bda14ef88b449e2d6
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 e5506697d46ae0e3d99d23846ecc8ec0f0b23f28
Merge: ca36e6e c8534f7
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 c8534f763338e0e706532cb232911db547140c14
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 19 10:11:55 2011 +0100

    PEP-8 fixes

commit 26ee927523bd849b4c41608a4c1fdedb1dcb484b
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 19 12:45:07 2011 +0900

    Revert Firewalldriver

commit ca36e6e018dac9cbd08be4bc32adcdb358d17fe8
Merge: 62a23d8 0dfe68e
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 26131a50a8665b49128e8763ae88dc8b757be3b7
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

commit d1b08cd61ceab1d5b2a45d9d76e44f982a4c28a3
Merge: 8931ef6 62a23d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:29:56 2011 -0800

    merged trunk

commit 0dfe68e8fa11a7666f137c7bef42996263494d94
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

commit ff84a73c5ea8fee774fcdfd6d8d673df071c0ebc
Merge: c0bc805 5e09079
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 5e09079d51475685e9d5de8808d213c432436404
Merge: c0bc805 62a23d8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 18:50:21 2011 -0800

    merged trunkand fixed conflicts and pep error

commit 8afbd3da41ed58a7c8fa2f4aa41bc41785dd1c86
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 19 11:13:33 2011 +0900

    get_my_linklocal raises exception

commit aa088e9338da9bc0c327ce9b23284861d0e45841
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.

commit 62a23d81f58eade6098dc6cbc6928da6ea9eaf77
Merge: 2e37964 6286987
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 6286987bc3b50eebb753a6cd676fd3cc4829835d
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

 run_tests.py |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit 044d1860bb44893da222561ce8532911737d8d4f
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 09:46:43 2011 +0900

    previous commit breaks volume.driver. fix it..

commit c0bc8057eb0d26e47ec56bbed09ed49860fe2845
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

commit 5e3531809c3c1a5534751163cc7c3724d750a0ff
Merge: 9e5db67 2e37964
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 18:10:22 2011 -0600

    Merged trunk

commit 9e5db6770648ba237cdba487d37438b415d1679a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 18:09:58 2011 -0600

    Fixed unit tests

commit 34c58c63512730c125daba63acfa054bd9ad4555
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:59:26 2011 -0600

    Fix merge conflict

commit 0718fb24a3312a1aae15a91bede2cf00be127f76
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 15:59:02 2011 -0800

    add two more columns, set string lengths)

commit 2e379647fb2b3717a2585ecf573ec8c0b37bbf6c
Merge: e2ae638 0dc6448
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 0d0cdcfbb1ffd3ef852932b72e39ad4d9b814184
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:57:11 2011 -0600

    Fixed unit tests

commit 3c7418753efbb5b3acd080e8887fac0dbe978707
Merge: c6465d9 e2ae638
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 15:51:13 2011 -0800

    merge from upstream and fix small issues

commit 25ac08ee5e3a2b99627e469f48517d177a42924e
Merge: 4d02421 573f1b3
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 08:50:47 2011 +0900

    merged  to trunk rev572

commit 4d024219f4b5da5e05b474c7357303ad7ea9bc6e
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Wed Jan 19 08:49:17 2011 +0900

    fixed based on reviewer's comment

commit 74cad95fbb96d8ae893fba05525add8f12dfc895
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Jan 18 17:40:36 2011 -0600

    Basic stubbing throughout the stack

commit 0dc6448628840b7e9b65fa3875e8cf27cc6d5736
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.

commit 2c756b45dd545732cca55c85315f7d5ee905972b
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.

commit ca9b2f6674b0b43dadec9d6a79549153bb1bff5a
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

commit 56d28110774169dbc0c316feeddc04e2e032242f
Merge: 4b21990 e2ae638
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 17:17:44 2011 -0600

    Merged trunk

commit e2ae638bcc6e6d027160bae5d298aaeb008d4ed9
Merge: 3b70581 7a7d2ea
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 3b705818485d8d3d183d2d25d5c2d013548184e2
Merge: 770026a 60b0b16
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 60b0b16fd3f5b7ced94affba32a2bf502a2e9913
Merge: 4850d4e 770026a
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 14:55:03 2011 -0800

    merge from upstream to fix conflict

commit e220faf23c092fda498219c64e75b179f9cd8f2b
Merge: fb4582a 770026a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 17:42:00 2011 -0500

    Trunk merge.

commit ef186d3787d635d623232576faf25052140ba513
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

commit 7a7d2ea14d8c47a8aaa6929e9020d93d0ca2add4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 14:07:03 2011 -0800

    disable ipv6 by default

commit 4b219900150fa7ac1907da08113034758d4ba228
Merge: 5d0eff0 770026a
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 15:54:45 2011 -0600

    Merged trunk

commit 5d0eff01fb541ab104668942c0e4fe1ed9f1fdef
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 15:49:42 2011 -0600

    Plug VBD to existing instance and minor cleanup

commit 745c8466b4bf99ad53000fa0c806a8d0cebe82cb
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

commit 770026afd11496b003c5c589f6de97e6a1d79fa5
Merge: 88f9269 5e98a34
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 88f9269bbb4158f1c603ae3d8de9e1496833c719
Merge: 2b7dddb 99e4d58
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 99e4d587b8543737cf28ab8a20487944985eac25
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 12:42:20 2011 -0800

    fix test to respect xml changes

commit f065d942355cba999047ec6cc1b28d1fae8c3248
Merge: fde25b6 a1bf037
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 18 12:42:06 2011 -0800

    merged trunk

commit 2b7dddb4e061ae091438fb0f8ba740b38bd87715
Merge: a1bf037 63fea2b
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 5bdff4f37f5e5a443f9cae16f44a6ec801bad8ee
Author: Kost <kost@isi.edu>
Date:   Tue Jan 18 14:41:32 2011 -0500

    added paste pastedeploy to nova.sh

commit 4850d4e82f73d330eae19c3aa6e1ccea251491f7
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(+), 0 deletions(-)

commit 63fea2b3144688a98ef1f2cbcaf53fa88a2369b8
Merge: 46b912c a1bf037
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 14:30:26 2011 -0500

    Merge trunk.

commit e819e488b84cb431b60b97e633aa68ff1480b55a
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 18 11:01:16 2011 -0800

    revert live_migration branch

 .mailmap |    2 --
 Authors  |    2 --
 setup.py |    1 -
 3 files changed, 0 insertions(+), 5 deletions(-)

commit a1bf037a0512f42b27e6b9483c203e4a12a3455c
Merge: 8363673 dddc8d2
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 fce7bc3c865fef1f8ceaab83ccd70786f4d7e275
Merge: 64bbe29 8363673
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 18 11:08:33 2011 -0600

    Merged trunk

commit 836367390f22a950f6ecaeefb8f9bca48efde7e2
Merge: 573f1b3 45b1a73
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 0ca8c3d55867241d3436ad22838e18ac877dcd25
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

commit 568420485169bbba86cd06a429e57e619586c616
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

commit 9e1a8d301135e6f9884576730b0248bf6e76b1c6
Author: jaypipes@gmail.com <>
Date:   Tue Jan 18 08:48:50 2011 -0500

    ComputeAPI -> compute.API in bin/nova-direct-api. Fixes LP#704422

commit 1786ca7a2d021b50267488d58bb8d66aff78d787
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

commit 46b912c1efb49e196d23ed8aebb6dc7be7bee9d5
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 02:05:07 2011 -0500

    pep8

commit b547bccb0c3ebd138c79e31134faef5df78eb7b8
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 18 02:03:52 2011 -0500

    I might have gone overboard with documenting _members.

commit fb4582a2cc202957c05ffa25f146b8cace2cc970
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.

commit 2181d1f7bc5d4dff422b0121a8530fb5f64aff10
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

commit 8227becbd7c6f9bcacc8a5d559da0c23f36e2b0c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 17 16:47:19 2011 -0800

    openstack api fixes for glance

commit cad4feba2b703fd0f8365c2a33361698ce4bbd64
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 19:40:35 2011 -0500

    Stubbed-out code for working with provider-firewalls.

commit 64bbe29fcd5c8d512bde0eab0c036aa71f6bf3db
Merge: f446695 573f1b3
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 13:59:22 2011 -0600

    Merged trunk

commit 5e98a34b052ae4b947707fdb5a6241f410f08ce5
Merge: bd0d13d 573f1b3
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jan 17 19:32:34 2011 +0000

    Merged with trunk revno 572.

commit f446695684d894fc6d6af46a5e7e9e4fc4066497
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 13:31:05 2011 -0600

    Better shutdown handling

commit 573f1b31782703ee3549ed317aa6266e9abfd865
Merge: 41bfdca 2084cfc
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 2084cfcd45949ad12351f82bec59d4e74d74d5b5
Merge: dee081e cbc8b99
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:51:00 2011 -0500

    Merge trunk

commit 41bfdca998adc613a241d813aa597e12ea2311d9
Merge: 6fdf306 cbc8b99
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 dee081ee549db9f75de5ec625fbfd63bab94d573
Merge: c44d6cb c848122
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:44:52 2011 -0500

    Merge pep8 fixes from wsgirouter branch.

commit cbc8b9960edc296aef0854cc7c709462eab0df48
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:36:55 2011 -0500

    Clean up openstack api test fake.

commit f1afcc2ddfac80ab0fd006d6f9145220a29aa899
Merge: a0be5ca 6fdf306
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 12:32:20 2011 -0600

    Merged trunk

commit a0be5ca27cbe756186357a2b5db11a6049ecf466
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 12:21:08 2011 -0600

    Add Start/Shutdown support to XenAPI

commit 6fdf3063baf9d74e8ea93602fe0f78e54e0e3dc7
Merge: 06f5852 a4b031b
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 821343ea9916863abba7283e2bfbfdb5ac5663b3
Merge: c848122 06f5852
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 17 13:05:26 2011 -0500

    merge trunk.

commit a4b031b3e758a2ea8a615a0f93f2034cd62fb5eb
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:34:01 2011 -0600

    Fixing whitespace

commit f795e47f1dec30bb37b42ddda7ebd633c17bc05c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:21:56 2011 -0600

    Returning image_metadata from snapshot()

commit 5f962c95c709c826d27122d915e13d500646211c
Merge: a61e708 06f5852
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Jan 17 11:16:36 2011 -0600

    Merging trunk

commit d9f6331281d7d329326c5af01dc4d6714a0ad5ea
Merge: 9c183bf 06f5852
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 17 10:43:46 2011 -0600

    Merged trunk

commit 0fe24825ffd517c4d24f6aa455eb1fedba9d6c4f
Merge: 247e344 06f5852
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Mon Jan 17 04:12:27 2011 +0900

    merged trunk rev569

commit 247e34479ee8c4585801330559e5665e8e70c40f
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

commit 06f58529971ae441a911941b0dac3f1a387ef1c7
Merge: 811aba5 3cae0ee
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 c6465d9cc34e230f356042a92b4760cd89482e6c
Merge: 9b5ba98 811aba5
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:57:42 2011 -0800

    merge from upstream

commit 3cae0eedb57028c00cc1c3c17459fb1c52798c83
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:54:36 2011 -0800

    pep8 fixes... largely to things from trunk?

commit 60f662abf04126a85c1ec3172a094bf04a178f54
Merge: 9449851 811aba5
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:48:48 2011 -0800

    merge from upstream

commit 9449851731edcfc32aec504968b9883f15ae8b76
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:44:47 2011 -0800

    pep8

commit 9cf71d74e18ede6d3f67ac8c661d3aaf07b2aa99
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 14 17:43:34 2011 -0800

    remove print statement

commit 811aba56a0707dca9407c33b64e062186fd4612c
Merge: dc92736 aefb217
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 dc92736b648a2452ed9556c2fb920e17dd249905
Merge: 8bc3a84 f50ec4f
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 aefb217d478afb4b36db79360fde34410b8fc5bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:36:48 2011 -0800

    removed rpc in cloud

commit 25bb235921c01f61b4dd0c2f4d9fb4317612942b
Merge: 689a8dc f50ec4f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:22:12 2011 -0800

    merged trial fix again

commit 689a8dcb6f2656ab73850d52e069e66134e6ac11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:20:46 2011 -0800

    fix bad function signature in create_networks

commit f50ec4fb6c00a83330730e334eece8a4ed1c1676
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:19:51 2011 -0800

    undo accidental removal of fake_flags

commit 9c183bf88c32084a0e60b0cc1dafcc8d6d1d734a
Merge: 91f3334 8bc3a84
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 13:16:43 2011 -0600

    Merged trunk

commit 95ed950c5a7939879a5d6027370ffc5a53b06816
Merge: 43a4626 4774fbd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:06:01 2011 -0800

    merged lp:~vishvananda/nova/lp703012

commit 4774fbde96380ffcb7ac16b351f515f94d1f0709
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 14 11:00:47 2011 -0800

    remove TrialTestCase again and fix merge issues

commit 43a4626177e325021a62a017d55fd4699131150a
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

commit 91f33349de49ef5f710d1a6799cb43425039260b
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.

commit 8bc3a842d1919490d473bf75669685a621ff8a89
Merge: 6409565 bb3f62b
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 bb3f62b97a6fd164a52264416801af6c4b141c3b
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 11:24:45 2011 -0600

    Create and use a generic handler for RPC calls

commit 92c871b16eade20400d511ce4efbbccb46d9e0f3
Merge: 10dfb1f 6409565
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 14 10:47:38 2011 -0600

    Merged trunk

commit edf34376abf69580d879d73e1b5ca0c259fabae9
Author: Andy Southgate <andy.southgate@citrix.com>
Date:   Fri Jan 14 16:13:50 2011 +0000

    OS-55: Inject network settings in linux images

commit bd0d13d3b24e96a810788bc375f77232ea5391df
Merge: 0eeb789 6409565
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 14 15:51:42 2011 +0000

    Merged with trunk revno 565.

commit fde25b6f8c55f886119f9ba31939561de6b9e77a
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

commit 64095656d12d9d4d76c0a6435027f511167fbeea
Merge: 10ca2cf 4ba3620
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 10ca2cf2f4b3365ff48e00c81b43f4db07d9ef99
Merge: 39a9118 0136e98
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 0136e98e33d6d7d542e4b8d179df931d7ff61696
Merge: 16b8593 39a9118
Author: Koji Iida <iida.koji@lab.ntt.co.jp>
Date:   Fri Jan 14 13:59:06 2011 +0900

    Merged to rev.563

commit 39a9118864db6baf026faa4e1e2e184aa79ef01f
Merge: d3c8790 5c6712c
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 5c6712c3d46ab0f90cd8cfb7356ac0fa7006df80
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:46:10 2011 +0900

    Sort Authors

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit a2be8ace2a23192371609e9ea1ce96197b09cf8a
Merge: 454835e d3c8790
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:39:54 2011 +0900

    Merge trunk

commit 454835e34413b5265559db4d0faa17babf0f63e3
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Fri Jan 14 12:25:34 2011 +0900

    Update Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 9b5ba98c3798579fcb88886cb961606c991cc22f
Merge: 9babdc9 d3c8790
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:06:17 2011 -0800

    merge from upstream:

commit 9babdc9a63734e6e10f0adab5bde96368867c38c
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:04:24 2011 -0800

    pep8 fixes

commit 4c0be444be8153ec031242f623fee888e8e10c6d
Author: Andy Smith <code@term.ie>
Date:   Thu Jan 13 19:03:07 2011 -0800

    update migration script to add new tables since merge

commit 16b8593aaffe847849b040235115d7bcb7dbddc5
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 14 11:44:35 2011 +0900

    sort Authors

 Authors |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 183f8573bbcd77dbf3172b45ea811ca75832954a
Merge: 571ddac d3c8790
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Fri Jan 14 11:40:50 2011 +0900

    Merged with r562

commit d3c8790f2b250e5ed18dae2ae0d5875551f3185b
Merge: a675a2e 10e7a01
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 c8481222ef199881315408528e0ce466f8eb72a0
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.

commit 25eaa0c41642e9311ace4a8bcf5c859a5f6e3d54
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 08:55:56 2011 +0900

    remove ">>>MERGE" iin nova/db/sqlalchemy/api.py

commit e1dd4338279fe96b4f5772dc8c1e997c33c62962
Author: Kei Masumoto <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 08:26:25 2011 +0900

    checking based on pep8

commit c44d6cb2cab0785fd9d96e0f6a9d97899942affb
Merge: 5ab5169 0e380b5
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 13 18:26:18 2011 -0500

    Merge trunk + wsgirouter.

commit 0e380b51d275b2489246ae6264fb0f92c76a3568
Merge: 7502fe1 a675a2e
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 10e7a01f88aac459e73b62fde6e38697a9a44141
Merge: 9560f99 a675a2e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 15:15:25 2011 -0800

    merged trunk

commit 9560f99fa5ed02ce97eb6fc5044fe526fc580139
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

commit a61e7084d9a855f0987244a054319426d6764053
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 17:08:23 2011 -0600

    Fix for Pep-8

commit 571ddace5baeae33ddd7c255da8c4eedb374c81c
Merge: 7bc59cc a675a2e
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Jan 14 06:50:44 2011 +0900

    Merged with r561

commit 7bc59cc1c5b2c971a3a7ac22e2e82cc1cb2b77f2
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

commit e0384e9526e7ae252c79236868aeb1c30dbebd82
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 files changed, 1 insertions(+), 0 deletions(-)

commit 7149cf9070cdecaa0a9f49239d1b93a75c3afe78
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 14:01:21 2011 -0600

    Marking snapshots as private for now

commit ed3821409ed92facf88c4c3a02b5fafa7e4a22a7
Merge: a364941 a675a2e
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 13:48:36 2011 -0600

    Merging Trunk

commit a3649417756697e674b246f784c9bc1ee4d002dc
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 13 13:48:01 2011 -0600

    Fixing Image ID workaround and typo

commit cfd3f8cee02c0382a84473f295a4a79ac712eb09
Merge: 6fb2dbe bdbd9e4
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 a675a2e686591e7bd329da292d886403e4c25130
Merge: 89f337a bab2202
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 bdbd9e4e2a192e1479c89200e4f7f07d0e65ece9
Merge: 9d9e7bd a675a2e
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 03:58:02 2011 +0900

    merged to trunk rev 561

commit 10dfb1f740f8e221f88438399b7d44fdd386a970
Merge: 5cb0147 89f337a
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 12:39:07 2011 -0600

    Merged trunk

commit 9d9e7bd2b49c465ad8d212c4f10ea70d9ce1be4e
Merge: 8955b0b 89f337a
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Jan 14 03:37:41 2011 +0900

    merge trunk rev560

commit 89f337a45c90ca59ac55083fda658b8368400462
Merge: 3159867 0d9191c
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 8955b0bf519df4d7719e8e69891ad571ada1db09
Merge: e2474af 17fec51
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 5cb0147fc84a30cc96849739296f4f17ef0b9800
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 11:24:11 2011 -0600

    Make libvirt and XenAPI play nice together

commit bab22026c9873cbcf9ddd7b4ae3de4ef88a3fb9a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 18:08:53 2011 +0100

    Spelling is hard. Typing even moreso.

commit d331662d2b3b0754a1a5f4538db234e55744b735
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 17:57:06 2011 +0100

    Revert changes to version.py

commit 4ba3620ac3f663f23a3b7bbde40672a1bed4492f
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:53:13 2011 -0600

    Minor code cleanups

commit 2d11880b7bcedbfdae66f06d5bc5fa0d0be8483f
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:52:28 2011 -0600

    Minor code cleanups

commit 32ca595afd36cff90057d6148c668b5491f2a719
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 13 10:51:31 2011 -0600

    Minor code cleanups

commit e947e9af1e982dd8e8fdac67fb303d12261e2597
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:47:23 2011 -0600

    Make driver calls compatible

commit 5371dff80555edc9bba9ae0603006b9150b5ee2e
Merge: cfb56f8 3159867
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:45:26 2011 -0600

    Merged trunk

commit cfb56f8f14c1d71618d6aa181d686d19c09663ad
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 13 10:44:29 2011 -0600

    Stubbed out XenServer rescue/unrescue

commit 36a2cd69c3ab5c8fefd2ba7a20b4f4f821fca1ef
Merge: cc3593d 3159867
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 c305437a1f66310e0dc8287f9696b2e4af9ff8c8
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.

commit cc3593db185c383ef41253c0b3ab66e863e255aa
Merge: ade49d6 7f780f6
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 0452be347db2c48d73fd3a8ce2042108b9435f7e
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).

commit 3159867582b2ef347b16c67213d16d1b09781a29
Merge: 66ba84f 47e04a8
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 66ba84fe08360f97f6159842e98d3cc419d9b64c
Merge: 4e7680e a16bffe
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 899bc851234813f31ca89dca6fead71a6b8196a8
Merge: 2f8bec2 66ba84f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 15:11:40 2011 +0100

    Merge trunk.

commit 2f8bec2886b0e9bb912ecab54e2b9ba129b7d8e3
Merge: d5a4c4d 4e7680e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jan 13 15:09:03 2011 +0100

    Merge trunk

commit eca226211a2f8ed50d8bb2df50599fa5c4e6913d
Merge: 5da48f7 4e7680e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Thu Jan 13 21:02:14 2011 +0900

    Merge trunk

commit 5da48f7920d4db6875f6a4b009646f2fefc3a159
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

commit 2196060d548c6cb319d8c8b36fceb4e9e4b21e91
Merge: 18d2616 4e7680e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jan 13 01:57:53 2011 -0800

    merged trunk

commit 15c8fbd0cadf227e4278c590470dc120555157a8
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Thu Jan 13 16:59:29 2011 +0900

    Fixed Authors

 Authors |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0c44b6e809994649e25526dd34045504a57de56e
Merge: b9a7195 4e7680e
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Jan 13 16:50:07 2011 -0500

    Merged with 557

commit b9a7195069de05b5b098627ad94d35f3a272e00e
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.

commit 5a06f23d79c328b0d73d929ac8ded33a86d38202
Merge: 9b1c607 4e7680e
Author: termie <code@term.ie>
Date:   Wed Jan 12 20:19:28 2011 -0800

    merge from upstream and fix leaks in console tests

commit 9b1c6071c3532dfe5ff4d0bff66172d3b81c6034
Author: termie <code@term.ie>
Date:   Wed Jan 12 19:38:27 2011 -0800

    make sure get_all returns

commit 4e7680e5b36b68c95834a2e2f7d0b27e37dc4d68
Merge: c537631 9fce3c8
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 a16bffeff556f316e1b0ba130f4fd934f1e1a87b
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.

commit 9fce3c87cb62bcab1a5ac4464e4b5df502a66b90
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 17:12:20 2011 -0800

    fix invalid variable reference in cloud api

commit 60079c258f4bd653b26767d6d5ca5afa84f7e57b
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 16:57:39 2011 -0800

    fix indentation

commit 78eefd140a2ea0b57a2fba3321a5293d294dafe8
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 16:57:04 2011 -0800

    add support for database migration

 run_tests.py       |    9 ++++++++-
 tools/pip-requires |    1 +
 2 files changed, 9 insertions(+), 1 deletions(-)

commit 47e04a809a032b8e22236d2801d2ed4fdd02497f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 12 16:56:21 2011 -0800

    fix changed call to generate_rc

commit 41a4aaa124d402029034b79d52060146c610a991
Merge: 0900e0a c537631
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Thu Jan 13 09:28:35 2011 +0900

    merged with r555

commit 0900e0a2f421bdc5ab70170464bb3748c858193e
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

commit 0d9191cce656d378b3b7fc267cbe74ffca505a18
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:21:18 2011 -0800

    standardize volume ids

commit 6925c72946feaad913c5dbc581e93d84a53f287b
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:20:13 2011 -0800

    standardize volume ids

commit 6c6dbe057333394560749260ba65daac25890113
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:03:08 2011 -0800

    standardize on hex for ids, allow configurable instance names

commit 11b3ec53569ca891fd9653240a6e204065024d09
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 15:01:23 2011 -0800

    correct volume ids for ec2

commit 441b8a58ad641067d67b8e01097809a61cb1674a
Author: Andy Smith <code@term.ie>
Date:   Wed Jan 12 14:56:26 2011 -0800

    correct formatting for volume ids

commit 5ab516909a6d2065e34cc00afcb0faa1e365b9e7
Merge: cb00a99 7502fe1
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 17:47:43 2011 -0500

    Merge trunk + wsgirouter

commit 7502fe1fb903c0861569386444be34cb052d91d0
Merge: 42d0387 c537631
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 17:41:15 2011 -0500

    Merge trunk

commit 42d038760132cc7ac5b1a346e2c02ae15771c935
Merge: 98a5fc5 099acea
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 c537631f2f9835cd15bc2bfc8b08cdca6db259b1
Merge: c4eadee f5d5445
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 9ee1bf4983f7f7a4f9c3308cc67f395664930c1b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 16:03:51 2011 -0600

    Adding TODO to clarify status

commit 7b4b4d490926e5adc5678c8ee0951fd07167e234
Merge: b5c802e c4eadee
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 15:49:44 2011 -0600

    Merging trunk

commit f5d5445690158e3e2811e8c639466b9c7d68a47b
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')

commit c4eadee69dc9e4654acfea9debc0d5b98ee3138c
Merge: 7f780f6 4e6df19
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 7f780f62b4adbe119fc56c2396c3c416584267a6
Merge: 099acea d52e44d
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 7b42aba2a45dce9ec8e936be45ccb5da59be94b3
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 15:07:51 2011 -0600

    Make rescue/unrescue available to API

commit 4e6df19f15e814f30aabfbee4a95f1d211845922
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 15:12:08 2011 -0500

    Stop error messages for logs when running nova-manage.

commit b5c802ecd96ed6a493220a564aa7afbb3b9880b2
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 14:01:20 2011 -0600

    Fixing stub so tests pass

commit eaff56ca2f2b03c8ef31127204a12963400c2302
Merge: 0920140 099acea
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 13:47:40 2011 -0600

    Merging trunk

commit 09201405e6d3ea05119138d1f1fd8f402e2b2824
Merge: 0bc538c 7fc1ce4
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Jan 12 13:46:34 2011 -0600

    Merging trunk, small fixes

commit 099acea9ff33c38722626198c724def0158122dd
Merge: f70ff6d a5ffc30
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 cb00a99b181c8f62b63f7aaea62c0f52760787f5
Merge: e88e3c6 98a5fc5
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:37:29 2011 -0500

    Merge version matching url change from wsgirouter branch.

commit 98a5fc56c4d596b3c1e562295c83473594b63020
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 files changed, 1 insertions(+), 1 deletions(-)

commit e88e3c66389610626d671a9cc73020aebc49830a
Merge: 1a8e356 16e3928
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:33:40 2011 -0500

    Update config for launching logger with cleaner factory.

commit 1a8e356d2de95755e9455a696b505e896470abca
Merge: fc01b59 aa67985
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:31:28 2011 -0500

    Merge trunk.

commit 16e3928bc39cac07eaa5cafb0d6b29b09e5455db
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 files changed, 14 insertions(+), 5 deletions(-)

commit ade49d688a6373749c58fe0e9e1720ee8102c672
Merge: b3db94f f70ff6d
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 12 13:22:30 2011 -0600

    merged changes from trunk

commit b3db94fe570357178568a58c6059e4563dc707aa
Merge: 0d1b4f1 164f822
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 12 13:22:01 2011 -0600

    cleaned up prior merge mess

commit aa67985a4d908826e3d34a00d89fdb697e08e831
Merge: 6b1e276 164f822
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 12 14:20:05 2011 -0500

    Merge trunk (logging, etc).

commit eabd3a8ef2b999f843c5b0e52e4e7bb558640aa2
Merge: 9478547 f70ff6d
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 12:50:17 2011 -0600

    Merged trunk

commit f70ff6d97fa9359ca4e8535755c110cc6d4e7954
Merge: 164f822 e204233
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 a5ffc30acedcd8993aa68fe3949fc67633d06ff1
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

commit e204233dae2a807161f4957cb893f52d9b17ffab
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.

commit 947854777fe265a956e06b4a8e4c0a74040284f7
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 12 12:10:26 2011 -0600

    Start to add rescue/unrescue support

commit d52e44dc9a06fc598360bb205cf840ad6fe5300c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Jan 12 11:28:05 2011 -0600

    fixed pause and resume

commit 0eeb789709416741bda2d80fb819bc91d3e457d1
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.

commit b2b17249d13e9186d03aa2c85b276d7e6ea18bc7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 14:37:03 2011 +0000

    pep8 fixes

commit 956ecdd4b27bce5e0d47aa84ea2a4113af84134d
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

commit 4f3f9eb81075cd1968c782079611e0efc40ee178
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 12 14:17:22 2011 +0000

    Fix for _stream_disk

commit a7742f615811b25ec60ea4a50a6800fbaa4bf559
Merge: 15438c0 164f822
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 22:02:31 2011 +0900

    Merged with r551

commit 15438c06ddfa42956f0356011cd41769bdd8b671
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 21:55:36 2011 +0900

    Support IPv6 firewall with IptablesFirewallDriver

commit 6bc2eb17a55501a7960ae70ea2e08b3bd6503959
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 10:12:18 2011 -0500

    Fixed syntax errors

commit 2fa9d0cf065a616d66ae7e11b62ee4631a03a83e
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Wed Jan 12 21:12:25 2011 +0900

    Check whether 'device_path' has ':' before splitting it

commit 04c2821610688e2d96a10748c50ef05671ca7060
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.

commit 03b1ccde719fff9d11dbd5e6c054fcd8f0c90947
Merge: fcbe278 164f822
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:43:29 2011 +0000

    Merged with trunk.

commit fcbe278c1433d2939dd3968242aadc9107bb939d
Merge: 40a4985 e62988f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jan 12 11:35:13 2011 +0000

    Merged with Orlando's recent changes.

commit 164f8225c43a293c63028f33bd518ca94c953890
Merge: 7797c01 9abc7e6
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 b09184adc8dab757584d5c395bab5f8bb40a064f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Jan 12 12:29:28 2011 +0100

    Eagerly load fixed_ip property of instances.

commit 7797c010b8df530d6507962f247968a96e7304e0
Merge: 1cc49a8 fb22ee1
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 40a49857e42a51f44eba06a616d460cac05ceb1d
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".

commit 5da634d4b3a544147dc19f6d4cf3521abef7f8f0
Merge: 447083d 1cc49a8
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 18:46:01 2011 +0900

    Merged with 549

commit 447083d932bdb85e33d40e25d1d87ceffa0682f0
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

commit 1cc49a872e5dc8fd2823f7b51448e89fce245fd2
Merge: a3f3ffa 5fbb949
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 94bf6f042da2dcb1e2c8c7925c6c0988d41aa984
Merge: 600f774 a3f3ffa
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 17:47:54 2011 +0900

    Merged with r548

commit 600f77457bb938f054c8feef8250819e10e02eec
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 03:50:09 2011 -0500

    Fixed bug

commit 271432bf664111b51a0c06c60c8f3fb0d08c6e73
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 12:05:27 2011 +0900

    Add DescribeInstanceV6 for backward compatibility

commit e62988fa15a473106ff7757b0a42288807e1180b
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

commit b85da2e5d3d4813288164955f65c200b53170f58
Author: Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Date:   Wed Jan 12 11:26:22 2011 +0900

    Fixed for pep8
    Remove temporary debugging

commit e40c42cc9f42d854ffe71a3b381fac9da4129494
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 12 02:15:09 2011 -0500

    changed exception class

commit a3f3ffac59e7268c08b94f69b0fd4998d00b84dc
Merge: 1f5af9e 9956fc8
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 1f5af9eece5b9f9518441c7b10ceb44baefa7115
Merge: 95c723b 68ddd42
Author: Lorin Hochstein <lorin@isi.edu>
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 5fbb9493992f40ddb31edc64eb89b8c5594347da
Merge: b478a98 a3f3ffa
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 11 17:32:12 2011 -0800

    merge trunk, fix conflict

commit dddc8d2ba392db0b547459b98d7b3f684871af9c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 17:21:39 2011 -0800

    more useful prefix and fix typo in string

commit d53ee475968f5124511b13ee6578c471b4168deb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jan 11 17:07:24 2011 -0800

    use by-path instead of custom udev script

 tools/iscsidev.sh |   41 -----------------------------------------
 1 files changed, 0 insertions(+), 41 deletions(-)

commit 95c723bc9dad95de04812aaf7f89a51bcfdd443a
Merge: 0496cc2 df4f34b
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 9abc7e6de3b164ff5eb12f3acc88c73f3d914b25
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Jan 12 02:19:05 2011 +0300

    remove extra whitspaces

commit df4f34be954c2d0193b173ed1d42ce3daddf0bcb
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.

commit b478a9883b3be464225640c52c7fde3952f083e4
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 11 14:33:20 2011 -0800

    bah - pep8 errors

commit fa5bdf726ab83add7fb2cb5f11e57e4b3e0911bc
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Jan 12 01:27:36 2011 +0300

    resolve pylint warnings

commit fb22ee15920e701dee9daf45b4a178056251bcec
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Jan 11 16:24:38 2011 -0600

    Removing script file

commit 0496cc2ba93c7491c8e859fad3c07135bae87e68
Merge: 7fc1ce4 5cbc9f1
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 68ddd420291c17d5052633192a26d5b715cb304e
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Jan 11 14:59:51 2011 -0500

    Added my name to Authors list

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 0bc538c71acbb584c35e3f6d9f5452e2b1668d7b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 11 13:54:23 2011 -0600

    Changes per Edays comments

commit 7fc1ce43c6abc3431abcdc2aaeb5ca9b7fbc6dda
Merge: 4ef01d5 d5a4c4d
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 0d1b4f1447392a1b25e6c814c08b74f424a36a90
Merge: 0841bf4 4ef01d5
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 11 12:19:29 2011 -0600

    merged trunk changes

commit 0841bf4d75731cdc3bbb2d0c98abf346be224bc2
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.

commit 7b7d6a918f4c6b14f42e47d326dfb4dac24b6f14
Author: Lorin Hochstein <lorin@isi.edu>
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 files changed, 2 insertions(+), 1 deletions(-)

commit aa399d816b5e57721f9697d3303ef3209dc565d7
Merge: 71b1e90 4ef01d5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Jan 11 12:05:51 2011 -0600

    Merging trunk

commit 9228595388107eaeb53a7fecef695c58c3505982
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jan 11 16:11:08 2011 +0000

    fixed issue in pluginlib_nova.py

commit 6663986f52b17624336c7b2eac1525904ada4b33
Merge: 889c5fe 17fec51
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Tue Jan 11 16:17:49 2011 +0300

    Trunk merge and conflcts resolved

commit 4ef01d520f11954e2f89113c26105732634fcffa
Merge: 17fec51 538d2d3
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 d5a4c4df2b839182e5f0ae28f827628fe07b0466
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.

commit 70c864b13728e948e500b0ad83e56fa097f85be7
Merge: ac1c480 17fec51
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jan 11 10:34:28 2011 +0100

    Merge trunk

commit e2474afa4c20b413bf3e3cef3a490bffc4fb1b09
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5cbc9f19684a48f2055c3f3e340add484fa7b150
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 11 03:38:40 2011 -0400

    Changed shared_ip_group detail routing

commit 105380f5b8df31652377d833709526422b14331d
Merge: 1c3405a 4ef01d5
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Jan 11 02:47:35 2011 -0400

    Changed shared_ip_group detail routing

commit 17fec51338be4e8073ecd804a41ab9e519b36c7c
Merge: 80a4928 8931ef6
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 80a4928822a1ee1d0f40a6e2362935701218e225
Merge: d4e862e 8f8badc
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 d4e862eaa118f4096b69a8889b74533d00fc63e2
Merge: 85144ce 93c7315
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Jan 11 05:44:44 2011 +0000

    Adds support to nova-manage to modify projects

commit a8a449b81362fafa9f24eb9cdda6e61e35c92bd1
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 files changed, 1 insertions(+), 0 deletions(-)

commit 343c4784f06b338f82bb76da48788c0d9c762531
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

commit 0a844a758e42b3ade4d67b56cf90ab9431081488
Merge: 40762db 85144ce
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 16:10:03 2011 -0600

    merged trunk changes

commit cabfaac711f0ef7bed8988abf6e6dd23d6ff6082
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

commit 40762db8c6f323f2899c0d58c82ca29480ca3782
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 15:33:10 2011 -0600

    Fixed issues raised by reviews

commit 85144ce46ea727112d1c8a0b84f6ac3b70496558
Merge: 5e66175 c6e997e
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 ae0340c9fd9889567dde298b782b7ea743a9f2f7
Merge: d3096da 5e66175
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 10 13:06:36 2011 -0800

    merge trunk

commit 538d2d34b72555a436f77910ee391633bdc7ab98
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 15:00:30 2011 -0600

    whups, fix accidental change to nova-combined

commit 4549d5940efa56d39e7a0e5d9d24d768820f8814
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 14:59:32 2011 -0600

    remove uneeded superclass

commit 5e66175f57650c0e1a4fcfb2da4ae4f9d06a5a55
Merge: 6629b97 d0a9998
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 10 20:29:42 2011 +0000

    Bugfix.

commit 6629b977427dc088fc2ec047adc812eb9b5f4a96
Merge: 6251fbd 5d62519
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 5d62519f8658cf9bf37feaf96297ef1574a1df5d
Merge: 6251fbd b9d0271
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 b9d027148311dca83a42a025214a750d78a90bbf
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 e770e8c01224dc43aa4c27bde0fa48779c25f0ae
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.

commit 46912e03a43b63a08623e4cc13065dbd293cb29a
Merge: 738bc48 6251fbd
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Mon Jan 10 11:37:06 2011 -0600

    re-merged in trunk to correct conflict

commit d0a99984030bb4124a683969ac325bb09205f989
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 10 10:57:13 2011 -0500

    Fix describe_availablity_zones versobse.

commit 93c73153d19841b89489c18724455a742e0aab21
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 15:13:30 2011 +0000

    Typo fix

commit 352051f9a3e3bb1128cc3a14ff030c8c60385ec1
Merge: 8abaf70 6251fbd
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 10 09:09:59 2011 -0600

    merged changes from trunk

commit b703e8ade174b878db80cabdf87bb5105e26e9ee
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 15:02:29 2011 +0000

    Adding modify option for projects

commit 6251fbd337d6453dcdea978d0de8c4eb7a32c992
Merge: c09ad94 ce00226
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 c5295eb228e938fba798d18f81784de305d9623f
Merge: b9d5c23 6251fbd
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 14:41:13 2011 +0000

    Merge from trunk

commit b9d5c23d0cc6849b5de5813fac4019954d3a04c8
Merge: 984fbf9 3a8449c
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Jan 10 14:40:37 2011 +0000

    Merge from trunk

commit c09ad94aec4ab08201358fa42eb5a882bd002657
Merge: 65f1ec0 d2ef575
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 65f1ec040881d34173743eaa84f265a35ffb2bae
Merge: 665b714 d50b649
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 665b714e62ea7ab3952c4f6bc68a8bcee26248c3
Merge: 98034c1 ac1c480
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 ac1c480dfb8fd790dd4f4108c70971e00c8791c9
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.

commit c6e997e9985c4bec15131aa80e1f55b533aae569
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

commit 9a3b72a7bda6380dabca8f0482e2ee95c0b52805
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

commit 28c06b44f5ac5465e6321c7befc26e6ec6028532
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

commit ce00226f155e82ad29c16a58f6bc4d19cde19b2b
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

commit 07a66709723e6ba52bac3f926455e6d0d157d687
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jan 9 23:01:10 2011 -0800

    fix describe instances + test

commit 8f8badce569748fec85ffe2bddd7c2a2b4cc372a
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

commit 98034c14867ae635545e8244769526383f6cdadf
Merge: 3432a84 2ac5d76
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 2ac5d760ef9782bc4c68ce451e779c97984efbd4
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sun Jan 9 11:13:19 2011 -0800

    alphbetized Authors

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 9c5923eef3ed819393552ac1c29cf880b3808293
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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 5a9c392874512ac956fd2f2922294a17f214c56e
Author: Ken Pepple <ken.pepple@gmail.com>
Date:   Sat Jan 8 17:46:22 2011 -0800

    typo correction

commit a8982826f65d85e6cb04d324bc8bb07275a3d2db
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'])

commit 8bb704096783c382c2c3a030b90d11d4b026d8bc
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

commit d2ef57588c3cabdd355a74dd56306c1ee84e5de1
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

commit d50b6496780ca995256ad216a8eb185181843af9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 8 10:04:22 2011 -0800

    use safer vgs call

commit 3432a840e7fd9ad7efba960595e18d2aa02739b7
Merge: 9a59054 caa660d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jan 8 16:35:02 2011 +0000

    Return proper region info in describe_regions.

commit 03a7def96295dae495d6f81d944687badb6db734
Merge: 3d0f9cd 9a59054
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jan 8 15:35:50 2011 +0100

    Merge with trunk

commit 738bc48b44415c211798ac539d2095a83c7ac582
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.

commit 03dd2bf211d399119e702e15a1f64abe729cfe32
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:42:38 2011 -0800

    small cleanups

commit 60b32fb1686780e85b98e7d7201581875c176a7f
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.

commit e34c295f7915cfb90d64fa2d27de8396ac3cd92e
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:05:06 2011 -0800

    some small cleanups

commit 882fa21111c7876b8284d4e9a50cc3ae79889986
Merge: ef55028 e7d0ade
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 16:03:53 2011 -0800

    merged from upstream and made applicable changes

commit 9a59054fa3848f2ed91d8ffd6219523336257e09
Merge: e7d0ade 9b8e386
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 caa660dc103f7839c31217c6646ddfdeec2fde46
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jan 7 23:22:52 2011 +0000

    Return region info in the proper format.

commit c5001b6ca3ac73ffb208b1684f8787f820d76e5c
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

commit 9b8e386a5e62aef5651846c95e15f24c802f30ff
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Jan 8 00:02:24 2011 +0100

    s/canonical_version/canonical_version_string/g

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 6ff487f2cdc2f8af17126b8b8a3c19264c291098
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 22:56:11 2011 +0000

    Fix indentation.

commit 5158d4ac9e2ad53b7263f88bfdedea946dabfd54
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

commit b367d42f2e1cad657fc5aa5acf2e2fc654be405f
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.

commit 8abaf701b0c694e829c43adb8b721aa0461d1cd6
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:56:32 2011 -0600

    Reverted formatting change no longer necessary

commit c3c2eac1f73fff51760df6604649628998e36d5d
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:51:28 2011 -0600

    removed a merge conflict line I missed before

commit 5a1d689c43abd0dbf11aa90eb24affacaf65018e
Merge: 2c807ff e7d0ade
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:49:12 2011 -0600

    merged trunk changes

commit ef550289ece871e098ef914b5ef04f9891bf6653
Author: Andy Smith <code@term.ie>
Date:   Fri Jan 7 13:02:55 2011 -0800

    set the hostname factory in the service init

commit 2c807ffab6e85d753b9a346fc25835b7e7015ec4
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 15:50:43 2011 -0500

    incorporated changes suggested by eday

commit 1b10c7b7852b3dc5b90935e6b1867a37c0155183
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 21:44:27 2011 +0100

    Add copyright and license info to version.py

commit e7d0ade6f6f1b80150bde59af7f45d71d8032158
Merge: dfd1a28 499fabc
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 ace2dbc6a4f02868f86ce3a36d592dc407970eac
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 20:26:25 2011 +0000

    Fix pep8 errors.

commit 77f6e5d5c6cd477f45244c7f2a944c51ecf61313
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Jan 7 20:19:59 2011 +0000

    Many fixes to the Glance integration.

commit dfd1a2883a451a03453ed84639b5b16963446f4a
Merge: 3a8449c 8b3365c
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 8b3365caf9789b7b33d05e8917784a4ccf27c7da
Merge: 49f4b99 3a8449c
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 14:49:07 2011 -0500

    Merge trunk.

commit 49f4b99f8ca67760160c6f55793096ead1701263
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 14:09:38 2011 -0500

    pep8 fixes

commit 3a8449cb7e613162a4510e570901e7f0fa7594a4
Merge: 0655b03 2ac7c53
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 0655b03fa0fc7e341109055d364a34129d7bd90d
Merge: ce39803 60aa413
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 2ac7c5380fe56cd8b8f866fb1ee1e22385ca708a
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.

commit dfb811d26f59bc841c341304dc685a4987abca00
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

commit 60aa41310fefa13898b8f68e17a41b47befff66e
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.

commit 64fd6f04b8317d62fd3153b2a1fea46ee59fefe2
Merge: e6f902e dc4ebe1
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 11:29:32 2011 -0600

    Resolved merge differences

commit e6f902eb81b1d8d0d478af69642fd397047aa6d0
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 11:04:53 2011 -0600

    Additional cleanup prior to pushing

commit aba14652a5f5a5d3e3d456d70d338b7d91922d62
Merge: 44e0ac9 ce39803
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Jan 7 10:57:53 2011 -0600

    Merged with trunk

commit 44e0ac9c8315331d1cf94d84523c41840fd02dd4
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

commit 36bf368eebc31268863788e15ff77e0af2e7ef7f
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 10:23:48 2011 -0600

    getting ready to push for merge prop

commit 499fabcaa4a50ffe80c2c91981197f9d3cf7a108
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

commit 7d862ef3571394e9e002d4d841b4b36f7d132ab0
Merge: c5f175b ce39803
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jan 7 09:46:17 2011 -0500

    Merge trunk.

commit 145b740855364f130fa602f38179c86c0ada01aa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 15:17:03 2011 +0100

    Less code generation.

 .bzrignore |    1 +
 setup.py   |   38 ++++----------------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

commit dc4ebe14a091e8aea8cfd12e6b5a482bf7cd3cf7
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 08:36:11 2011 -0500

    grabbed the get_info fix from my other branch

commit 3fdfbeb71e213a903eb023c0ac45bd204ce50a5a
Merge: 2e9c5cf ce39803
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Jan 7 07:28:30 2011 -0600

    merged changes from trunk

commit d008a47c455883206f676e240f16192bf38a4643
Merge: 238a051 93f5d0d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 14:00:49 2011 +0100

    Merge version stuff

commit 3d0f9cd7456243399e1a634bb6d21c819276cdd2
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.

commit ce89101e225d644f74f4291d81287d314a896403
Merge: dba559c ce39803
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jan 7 12:03:45 2011 +0100

    Merge trunk

commit 71b1e90116c08afdcb88522ec701785d81718259
Merge: c50caec ce39803
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 23:46:36 2011 -0600

    Merging trunk

commit c50caeca09364b72383927d2bab5cedbe8d6c539
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 23:38:01 2011 -0600

    Removing some FIXMEs

commit 486e1a3e7e7cd5b68d3d2f690db14c085642c01a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Jan 6 21:37:33 2011 -0600

    Reserving image before uploading

commit 889c5fed0e7046bf755f43a01b3895b730592daf
Merge: 5fa9bf9 b55e4fe
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jan 7 06:18:01 2011 +0300

    merge

commit dff950ad676bd622964ea8c4377f09e9ac0e5be1
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.

commit 362d4cacd01d7c58af7554ec3551523dbf77eb04
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.

commit 1c3405aade26828b52e7f5130d64ac0eb50aed8d
Merge: 36f4684 ce39803
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 b55e4fe13fd0d62eb417e5fa9bcd7c40ee728b31
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Fri Jan 7 05:59:30 2011 +0300

    merge

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit ce398033383ce386c48f723b9aeb422baca52bc3
Merge: 94c916a db5c3ed
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Jan 7 01:19:22 2011 +0000

    Include date in API action query.

commit db5c3ed65cc9bc23398b238effce1da14f81e2b8
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:59:15 2011 -0600

    Review feedback

commit 94c916abf49418cdd242172dea01c8157bd82416
Merge: dfc8569 69c80d7
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 57f32e3c1d01e0e7274dc3ccbb7268dd86fc9a3b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:18:28 2011 -0600

    Review feedback

commit 1e97644df6a89a2ed7c749bc7402943ca6fabe4f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 18:12:22 2011 -0600

    Review feedback

commit 6882ebb2a574190839213c9fb7ed6064cff1d41b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 17:50:44 2011 -0600

    Review feedback

commit 69c80d7b1071cae94b5e112f131eb6e3e49d4e7d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:27:57 2011 -0600

    typo

commit 67930f7e9381d9396c618b84df12061c2c19a808
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]

commit 014e5c6f9a5991cd07fb7dc39514c2b90dac04d5
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 17:23:00 2011 -0600

    passing the correct parameters to decorated function

commit 7bb12c56934c70110ca962b3080c0cfa1ffbd6a8
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

commit 8cdfcee0c8e6641c147709c681c1c5df890b4a1b
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 17:37:02 2011 -0500

    various cleanup and fixes

commit 596274f9bd7def8569ed9bd31d23b121bbd5337e
Merge: 9f91ccc dfc8569
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:35:48 2011 -0600

    merged trunk

commit 9f91cccb36d5faddacf2de430ca7e6cda11908ba
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:30:45 2011 -0600

    pep8

commit 8bf20570adf7789cdf4588f52caa3fee1a993fd6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Jan 6 16:21:59 2011 -0600

    altered argument handling

commit 2e9c5cfaccb1a4f782abdf61fce7362fb92cba7e
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 15:53:11 2011 -0600

    Got the basic 'set admin password' stuff working

commit ac07041344266d469dce2e1988fd71850be2752d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 15:33:01 2011 -0600

    Include date in action query

commit 93f5d0d461056671bf9218de9a75992382ca665b
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.

commit 11924ad476b2047c64f06edc73e2ae497c4067dd
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:20:04 2011 -0500

    Add default version file for developers.

commit 9956fc8c456916e657224e614281bbb0d294afa4
Merge: c1b141b 984fbf9
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 6 20:14:22 2011 +0000

    Merge from trunk

commit 4b6433eda823089f0d92ee85f2d4a71a78b1bd59
Merge: 311575e c5f175b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:09:50 2011 -0500

    merge pep8 fixes from newlog2

commit 311575e0076ba4c9bd1d1a2c0a76d36b0e6dc481
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:08:26 2011 -0500

    Track version info, and make available for logging.

 setup.py |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

commit c5f175b7268c4891d47187cfc2732bf9f0ef8f1b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 15:08:14 2011 -0500

    pep8

commit 856658c2fe6d37986742a9162bf6686286721479
Merge: 5e29076 47ab3c5
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Jan 6 13:51:34 2011 -0600

    Merged trunk

commit fc01b59e85e968af10f68b34bb3ee26c40b44ccb
Merge: da41310 6b1e276
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:46 2011 -0500

    merge pep8 and tests from wsgirouter branch.

commit 6b1e276900ef0c38d5e14415fa323137c9a1480d
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:18 2011 -0500

    Remove test for removed class.

commit 41e50240e0cac1af9743a99f77945b48dc84f951
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 14:22:11 2011 -0500

    Pep8

commit 25fb4c7b4ca6f348b871438c580974246c9b33ab
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Thu Jan 6 13:19:58 2011 -0600

    pep8 fix

commit 80ae84b1fa711ddf27a77e32ed6cc318b30ee428
Merge: 92e8755 dfc8569
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 13:02:57 2011 -0600

    merged trunk changes

commit 92e875514b6ade94e0434b5c235c6e1388348aa4
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 13:02:32 2011 -0600

    commit before merging trunk

commit dfc8569731d7173106229119d85ba56eb0da1eec
Merge: 47ab3c5 bef6a4e
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 da413100b3f925fde8273f1967a047879db1317d
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 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

commit bef6a4e7368a0cf67241dd715c8f933347f10e76
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

commit 2e0c0a0067093e0de383226ddcab03be2b4bc5e6
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

commit 7791a38abd30dd97e58f48a9c42af6d9fdee5614
Merge: 957ea1d 4c5281b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:18:30 2011 -0500

    Merge __init__ file.

commit 957ea1dda5a1001a7ffcbd51f11fcdda2b2e7d84
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jan 6 13:18:17 2011 -0500

    Add factories into the wsgi classes.

commit 4c5281b9f6821dedee394ffc61975cad87faf7c6
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.

commit 984fbf90b6359428572a38268777a816fdec4bfd
Merge: 3b58b75 47ab3c5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Jan 6 13:54:41 2011 +0000

    Merge from trunk

commit 552ef019765701dd1047312ab92290a75ffe3ffa
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 07:21:11 2011 -0600

    merged trunk changes

commit 47ab3c54f984017955e2e21a684518239e0b1d08
Merge: 9a0f162 e9ef52e
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 166af2d9fec5ed195ab202d72601169dd6622af6
Merge: b469f2e 9a0f162
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 07:00:02 2011 -0600

    merged trunk changes

commit b469f2ed14983f1f704fc0fa9805d252034c8098
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Jan 6 06:45:14 2011 -0600

    Renamed 'set_root_password' to 'set_admin_password' globally.

commit 36f46848b93035c2aefe7a796e2c4d648056a149
Merge: 8bf4f4a dfc8569
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 04:59:13 2011 -0400

    merge with trunk

commit 8bf4f4a72a385dd38f91d267c9f09d824a746c5c
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

commit 168df218f4915ebed0b46e7454edb1a44ce6099d
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 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

commit 22c2468659e7618d7bf753bfc5e577f8d62aa55c
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Jan 6 03:05:59 2011 -0400

    Fixed display_name on create_instance

commit 2bedd534a76d84f246d18ce4b9b7322b46568690
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

commit 4040de4f0fbd9fb2e9d2cb27e8eb3445cdc68ae5
Merge: 02b62af 47ab3c5
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 02b62afd24b02bcc966363e525acbc1f886276d9
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 4c8f75f20a1fc7870619286520c742f7cba42c12
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.

commit 8931ef69444fd5ca85b097df3cae2ab04e10ee05
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

commit b8cad2611b8c41417a067797a03628982aaddecb
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 19:45:46 2011 -0600

    Fix a bunch of pep8 stuff

commit 9a0f162e7219e8d42ee43670c2d910cf0bdd7288
Merge: 83850fe 74e0616
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 74e0616c3fd0b44f1d50f93943ddd7e1fb6539a5
Merge: 38a97e5 83850fe
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Jan 5 20:13:49 2011 -0500

    merge trunk

commit 9ff9b0158f1891f937b9b6a8352d740b9bc2414f
Merge: 7e89461 83850fe
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 19:04:23 2011 -0600

    another merge from trunk to the latest rev.

commit 7e8946160c1e7ced43bd3906774c85d60e60bcac
Merge: 4153bfe ded8d82
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 83850fefd7250d81747c2bf835663cd037dd4a71
Merge: 1a58f1f e43355d
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 1a58f1f86439d4d84334d9808111e54c66832cdc
Merge: 0559814 d128c43
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 3b58b756dca1866f38e4739272d3efc6ff5cc44c
Merge: 7bb3d49 9a0f162
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Jan 5 23:31:12 2011 +0000

    Merge from trunk

commit e9ef52e841511118a1915ba5db3ad29ffb2c4151
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(+), 0 deletions(-)

commit b66df26b96bccf9ad819c647a46aabd353081fcd
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Jan 5 15:02:09 2011 -0800

    Make test case work again

commit 055981431567cd0bbf725683ea8b4bd5f90b7348
Merge: 828d64b ab84d91
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 d3096da881f33fe60a63064c5f3b108987822d8a
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

commit 6133dc76cc2bf1133a4dc6e1440963ec89780612
Merge: 17148bf 828d64b
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 5 16:42:36 2011 -0600

    merged trunk changes

commit 17148bf966b1828791a9526cc32d7548fceb62a4
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Jan 5 16:41:50 2011 -0600

    intermediate work

commit 828d64b29c4cc25d7879b7e44ccb80b8e75c59dd
Merge: dc1c74e edd86b9
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 5e2907672b6c172b5a050e04a2dbcab50593d80e
Merge: ded8d82 dc1c74e
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 16:31:11 2011 -0600

    Merged trunk

commit dc1c74e980b70bcc1b45fdef8a0bf0272812f25f
Merge: ded8d82 645f5f1
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 22:29:40 2011 +0000

    Recover from a lost data store connection.

commit 645f5f17688e47d76a7bb841a56869afca1d208b
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Jan 5 16:04:16 2011 -0600

    Updated register_models() docstring

commit 18d26162765e8a1367099e8a130b4777401b7493
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 20:46:18 2011 +0000

    simplify decorator into a wrapper fn

commit 4153bfe5b12f9b647f267e0fae5be921f7d45f8f
Author: Monsyne Dragon <mdragon@rackspace.com>
Date:   Wed Jan 5 14:16:14 2011 -0600

    add in xs-console worker and tests.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 54e5a49e67d1070adcb8b6b74147f5e6639bd591
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:52:55 2011 +0000

    pep8 cleanup

commit c6314b667b1e9bc73d7641539c226cbb9016e1e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:50:39 2011 +0000

    more fixes, docstrings

commit 2366c8e1b921c636d77c4d53337b8bc04e640565
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 19:16:17 2011 +0000

    fix injection and xml

commit ac5bfaac162f42e7ed1140fd6e10a2c90a627cdd
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Jan 5 13:10:25 2011 -0600

    Fixing formatting problems with multinode install document

commit ab84d91fb33f4ccdf0a1b0d625a8b0bedb410aef
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.

commit c14f0d5166e448cf8030b1f885cacc983947a480
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 12:39:35 2011 -0500

    missing _()

commit f9b9dba867d28f0851f5859a48b9be9ffe922c25
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 12:38:34 2011 -0500

    Fixed for pep8

commit 4c6a8d5fa9c55f78f4043d2ea8c26d8a8cab18da
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

commit 6ecf2833544004e40f045884ddcf01640ff4d388
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.

commit 087a1c612f36081ca8bc47311f7f86df5801b38a
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Wed Jan 5 10:35:15 2011 -0500

    Fixed misspelled variable

commit 73cd0a5c8c9492c88cc87767eebc14454d8d7e9d
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

commit 0a9ba82e8c39c4678e0fb708e270e3d33c158d3a
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.

commit 185d89aefc4263105326e69178ef37da12024da7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 09:40:19 2011 -0400

    self.XENAPI...

commit 31a153ddfb487d9e9ba18d9374beca345b41e406
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 09:23:19 2011 -0400

    Changed Paused power state from Error to Paused

commit dbe9159b4c0b94befb5348ec203ebecafe53e52d
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 files changed, 1 insertions(+), 1 deletions(-)

commit 10c2cc657e782b025dbfc7743a54f78a4add3d5f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jan 5 08:05:11 2011 +0000

    stop using partitions and first pass at cow images

commit d128c436f20eb19f9c1e74512d0e21d02a5ef150
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 02:56:02 2011 -0500

    Remove stale doc files.

commit 5e70723ff98c677a78e829d3d09d61ec54167073
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 03:51:21 2011 -0400

    pep8

commit 70cdab2e0d3778c160136264eb711381ec73d1ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Jan 5 03:10:49 2011 -0400

    tests fixed up

commit 238a051b5a5a2d69f9d455293ef0f70601ff2a93
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jan 5 01:54:31 2011 -0500

    Better method for eventlet.wsgi.server logging.

commit 0494e30f72dab1bf15ac56bc339cfade89b27a81
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.

commit 99afca6aaa6ab28fd75c6935f47cf264bac73fa6
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:50:17 2011 -0500

    Declare a flag for test to run in isolation.

commit 3951f931283cd0a73846d687a8fae5e725494fc9
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.

commit d950c2dd4eeaaaeed8eb1984ebf1ee5891683439
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Jan 4 18:34:47 2011 -0600

    Recover from a lost data store connection

commit ac753f19bf2dd34146c6a2f087d7a39188ea812c
Merge: 2664465 edd86b9
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 18:33:08 2011 -0600

    Added xenstore plugin changed

commit 2664465b5642400b8ea0f43b130bb18df958e59f
Merge: e16b960 ded8d82
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 18:25:40 2011 -0600

    merged changes from trunk

commit 38fd7eed7b5309fb4ad909c53f1cd1c358f03e63
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Jan 4 16:22:47 2011 -0800

    some more cleanup

commit 3fa64080e09a0745975430d72c1cd261c8728ef7
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 16:21:27 2011 -0800

    need one more newline

commit 57a37e0a01582cfbd5ae36c667a1075796add065
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 16:20:14 2011 -0800

    Redis dependency no longer needed

commit dc9a90e0b19f9a3d46e631dddfbcad9af239b173
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.

commit 7e312d8322c6554e4c29a43f4261b1d466b70fe1
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

commit 1f309e702e303bb69388b4085050caf91289f27c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 19:02:56 2011 -0500

    pep8 fixes.

commit 9bde18df19533f1090dfc59c4e597fed6c94cf96
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.

commit 14d2dc5b8d75e8d09f64a2cbd78736d914d434b8
Merge: a34db58 ded8d82
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:42:59 2011 -0800

    Merge from trunk again

commit a34db583848ea80c9015d95a2c3b13380e333b49
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:42:29 2011 -0800

    i18n logging and exception strings

commit 9ea04c607dd52c8e449adddee703cbbe21e5d449
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 18:33:17 2011 -0500

    remove unused nova/api/__init__.py

commit 61c7c0a17e015fa1ae680ba38b0258baad801c61
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Jan 4 15:18:28 2011 -0800

    Merge from trunk again -- get rid of twistd dependencies

commit e25a5e822050e9b89f8115245fec01fc124e2f6a
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.)

 etc/nova-api.conf |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 5bab1087210dae2d1f9d1fa88dc2e92773d3191b
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 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

commit d15c1439e657eb385d01aa2b131bcbd5f71ed3c6
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

commit b3c3850b6cd2096e0da19884862e193cf1d990a8
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:39:48 2011 -0800

    rename easy to direct in the scripts

commit c541a86c01f44828176a3a62e52f917a7b04d109
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:37:04 2011 -0800

    fix typo in stack tool

commit c809199b5a8eea0fe4fc2e155af3f5b2b970fb4c
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 14:07:46 2011 -0800

    rename Easy API to Direct API

commit 7a5337accdefda3d4e5ec291eb9697ec20d5db9e
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.

commit edd86b9bb3b30d2851dee67efe9abadde6d564b1
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.

commit fbd6588df872ae8fb86951ecd935a1e9b4439d5e
Merge: 8ac2c01 ded8d82
Author: Andy Smith <code@term.ie>
Date:   Tue Jan 4 12:57:18 2011 -0800

    merged from trunk

commit aa60046ba7fa37e102bcc08f192d151bd08b0362
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 12:27:50 2011 -0800

    Renamed argument to represent possible types in volume_utils.

commit bcb878e8636531ea603640aa20f52bba91741454
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 12:16:43 2011 -0800

    Removed leftover UUID reference.

commit c5201dc284793c0f01e193c34a8fbe835ebb427a
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 09:44:15 2011 -0800

    Removed UUID keys for instance and volume.

commit 7136ff384174ec71999a6b7fb3504b40e210f045
Merge: d8c98bf ded8d82
Author: Eric Day <eday@oddments.org>
Date:   Tue Jan 4 09:07:09 2011 -0800

    Merged trunk.

commit 29061a3e656fad1c3f2fbd3de1f9b714cbaa92ee
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Jan 4 10:48:10 2011 -0600

    Final edits to multi-node doc and install script

commit 556011d8680f2ac867ea03551aa047f420e2615c
Merge: be34f64 ded8d82
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Jan 4 07:49:22 2011 -0600

    Merged trunk changes

commit ceaceaeb1dfca3796672a6c83a6cb2b4586b26b4
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 07:40:29 2011 -0500

    Some Bug Fix

commit e306d9cb6a65881ab31be15988da963355733705
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 05:35:13 2011 -0500

    Fixed bug in libvirt

commit f8cab03406226156c2af0d4267ea7eb0c4850520
Author: nova <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 05:00:21 2011 -0500

    Fixed bug

commit ca7796bb8e6ebc2cc7ebe301bbb144d652f5b335
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 04:27:39 2011 -0500

    Fixed for pep8

commit c19195a08fb2f3539fa901370ed3f642b427f2e0
Author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
Date:   Tue Jan 4 04:21:50 2011 -0500

    Fixed conflict with r515

commit 51a2ed01a8f7a23628f940ed2146a08a4ef3d938
Merge: 851809b ded8d82
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 1023fb37b14ec397b883df8985a7204243e01e54
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 22:51:19 2011 -0800

    some fixes per vish's feedback

commit e03836f0d68888c58ff526b746700079413eb220
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 00:37:47 2011 -0500

    Don't know where that LOG went...

commit 14006fb9912fae60287a31f7947c1fa4bb7928ba
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jan 4 00:26:41 2011 -0500

    Final few log tweaks, i18n, levels, including contexts, etc.

commit 8993b55e41984f4d28b3d90a58c652d6bc180032
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.

 setup.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit ab3f5f98efc63b1238a95b70ba0ec6743935f6a3
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 19:32:25 2011 -0800

    dabo fix to update for password reset v2

commit f7b220f36648740adedc1db94978dc2b0437cc10
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 files changed, 3 insertions(+), 0 deletions(-)

commit d3f63b92604e55a107672275b6e36158e07d701e
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 19:10:33 2011 -0800

    dabo fix to update for password reset

commit d509813272f649bbcb36fc479591b585a3002238
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 17:06:50 2011 -0800

    added cloudserver vars to novarc template

commit b425170d8ff050a5b247d4e860882db3b03f500a
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Mon Jan 3 16:07:53 2011 -0800

    Update Authors.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b8c0d3adefb68cdeffad0968cb2b31b21ade69d4
Author: Josh Durgin <joshd@hq.newdream.net>
Date:   Mon Jan 3 16:05:55 2011 -0800

    Add support for rbd volumes.

commit ded8d829747f715facc7776ca4a3537328907495
Merge: 30ba6e2 19aef5c
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 3 23:49:48 2011 +0000

    Fixes LP688545.

commit dc926b09a05459c545dc7110e02ba18125466a86
Merge: ded8d82 fc03d34
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 e0da3dfe9eb12058f786d0ac8263aee1ed9681e1
Merge: 2c1e8c9 30ba6e2
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 16:58:45 2011 -0600

    Fixing merge conflicts with new branch

commit be34f647caae952f74a0c155f0cdac1f9951b6e4
Merge: 942fcb2 7bdb5b8
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 3 16:43:24 2011 -0600

    merged in trunk changes

commit 2c1e8c9ec54fbbcb56bcf855e3559877d9523d6e
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 16:14:18 2011 -0600

    Fixing merge conflicts

commit 19aef5c0f2e4e705262bcf436ec9974b5f070d4c
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Jan 3 16:08:52 2011 -0600

    Fixes LP688545

commit 30ba6e252765ef8c6a749c0c192d33394ff2fcb6
Merge: 86bec04 41ffab7
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 9d0351b3cb9f34a421935e0abb6a14ecc6304651
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

commit 11314d7ec98005ff75fd08d0a5bd1aa269f1579a
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Jan 3 14:38:53 2011 -0600

    Modifying based on reviewer comments

commit 86bec0416657da6558d10709bd21dbd71f534a5b
Merge: 2015981 6e97daa
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 f0ee481e5e051e4eb6e4ba4a0c0c5474bd4ba264
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

commit 20159814cb9ef9f43674dfabbda6dfe4bf3c238a
Merge: 44a6b4e 50e4867
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 44a6b4eb812609bb9c02802200346449f80c3209
Merge: 63679d7 1840970
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 f345cb21735d80215df3ed843c13eccef1e6e8dc
Merge: a21e8ef 63679d7
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Mon Jan 3 11:39:50 2011 -0800

    Merge from trunk: process replaced with util

commit a21e8ef650375730f3f1e157821b7ae0ef018bd9
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Mon Jan 3 11:37:07 2011 -0800

    Merge from trunk: process replaced with util

commit 1840970c9a993f6d4c844c0f2883d5c143938cde
Merge: efffdcc 63679d7
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jan 3 14:29:39 2011 -0500

    pep8 fixes

commit d8c98bf66e7298df94a1d9d5b698012d72079f37
Merge: 6273497 bf9fbe4
Author: Eric Day <eday@oddments.org>
Date:   Mon Jan 3 11:21:01 2011 -0800

    Merged compute-api-cleanup branch.

commit bf9fbe4154cb367d819f4e8668fdc96c12828d90
Author: Eric Day <eday@oddments.org>
Date:   Mon Jan 3 11:19:36 2011 -0800

    Removed compute dependency in quota.py.

commit b877f3ab9029f1ec3ac2fb16afb37696d147e95a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 10:57:35 2011 -0800

    add timeout constant, set to 5 minutes

commit 50e4867e93bcb81b6340c42ff46bccfd2db7dfa3
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

commit 63679d7de286c2da8a7bc9323c9138a53a50e7ed
Merge: 7bdb5b8 72ef510
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 18:14:19 2011 +0000

    Several documentation corrections and formatting fixes.

commit 50c74061d44a33a20e8a4362b0a3f70dd93c6d70
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

commit f5c254b15ac00fe77798401e3530bc33f9475df7
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 08:56:36 2011 -0800

    add stubs for xen driver

commit 057a3f84370d86a2860434755471943bb13e3b88
Merge: a6889e4 7bdb5b8
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Mon Jan 3 08:51:35 2011 -0800

    merge in trunk

commit e16b96048e761ed47d431b921b2d65ff9404a169
Merge: 538d4b4 7bdb5b8
Author: Ed Leafe <ed@leafe.com>
Date:   Mon Jan 3 09:56:49 2011 -0600

    merged latest trunk

commit 38a97e5aadab9e6fdab697b219a8ad7b0144b1f9
Merge: d5c17e3 7bdb5b8
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 10:27:39 2011 -0500

    merge trunk

commit 72ef5102e0314305a1c39fb7c3f701a0695c93cb
Merge: 1dc5b66 7bdb5b8
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Jan 3 10:09:58 2011 -0500

    merge trunk

commit fc03d345a00e6be0f94413f23c2f5229cc6885ed
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Jan 3 05:17:42 2011 -0800

    temp

commit dba559c8e6d8548124163048454304a138352f34
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.

commit f86702c9b6cc267ebfecbeb9fe12b589a704e142
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.

commit adb47d785f17de400d86018fbd1aa7dd61d37963
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:16:02 2011 +0100

    Move a closing bracket.

commit 0ba05228c739bfe420eaa0a731d4b3eac62a6927
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 13:06:14 2011 +0100

    Stub out init_host in libvirt driver.

commit c75bcc0a641af9a47859315d88152f00b38bef33
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.

commit 1474fe726258c6994caeb9884c5a65a5073d8ea1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 11:39:02 2011 +0100

    Fix a merge artifact.

commit fac8b79c544fff83823c4fcfad5c7b088d1a7765
Merge: 06a6d86 7bdb5b8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jan 3 10:56:21 2011 +0100

    Merge trunk

commit 41ffab7a934b520dfd1cb03b59b8c5fd262cb9e9
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.

commit 538d4b4f556a284f84d7282df096a031cc005d86
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 12:21:04 2010 -0600

    Updated the password generation code

commit fc1c4cf89ca4a36b11fe608a7f4150b4f67ce227
Author: MORITA Kazutaka <morita.kazutaka@gmail.com>
Date:   Sat Jan 1 02:53:51 2011 +0900

    Add support for Sheepdog volumes

commit 732e0adb9b02dc5b00cfbccc5f2b3751b0f40985
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)

commit 46081aa192df4c444fdb5e41a52f490f1e7fa909
Merge: 7684b3a 942fcb2
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:57:16 2010 -0600

    Added agent.py plugin. Merged xenstore plugin changes.

commit 7684b3a10cbbe2b5c299959822a684073b4bb74d
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:54:10 2010 -0600

    fixed pep8 issues

commit 942fcb280fc7c678e76f177ac95c757479c7aa7b
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 08:53:01 2010 -0600

    Added OpenStack's copyright to the xenstore plugin.

commit 66c1bb7c8d5b720c9803cece20e030214ace657e
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 07:04:40 2010 -0600

    fixed pep8 issues

commit a96a2c880a753d29a3a3c738f356846a0a1031bc
Merge: b20ac6a e06d4cc
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 06:41:19 2010 -0600

    merged in trunk and xenstore-plugin changes

commit 7bdb5b8d2d03d9b468288103e48ffb13cbbc97bb
Merge: 5bccc17 5a15994
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 31 11:39:14 2010 +0000

    Ignore CA/crl.pem

commit b20ac6a1fe67a3e9137a7585b3b17980391aa283
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 31 05:37:30 2010 -0600

    Before merge with xenstore-plugin code

commit e06d4cceb289329119fb5357e4e8dcb8a9268c22
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.

commit 5a159948eecb0a7613487ffab774f9754c98c190
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 20:03:21 2010 -0800

    Ignore CA/crl.pem

 .bzrignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 6273497f556d16da5a662da66cecbf0e38968387
Merge: 2f90876 d96cdd4
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:58:21 2010 -0800

    Merged trunk.

commit d96cdd4875b0fb9e9210714b814038d3db29f2d1
Merge: fde0418 d8b9689
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:55:00 2010 -0800

    Merged trunk.

commit 6fb2dbe39fa21041bb97f84c0b13b7a038178493
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 ----------------------------------------------
 1 files changed, 0 insertions(+), 154 deletions(-)

commit d8b96892e840d1155e353f4083d63299666f3915
Merge: 6d43ccd 919f168
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:37:56 2010 -0800

    Merged trunk.

commit 919f16877bd1d53b470182c13e0771ee9e553505
Merge: abca7a3 3c777d0
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 19:35:02 2010 -0800

    Merged trunk.

commit c3873eeedaabdf2dd9aaf3f2fd620fbc6bdff739
Merge: 7a35fb8 5bccc17
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 31 12:18:58 2010 +0900

    最新バージョンにマージ。変更点は以下の通り。
    Authorsに自分の所属を追加
    utils.pyのgenerate_uidがおかしいのでインスタンスIDがオーバーフローしていたが、
    その処理を一時撤廃。後で試験しなおしとすることにした。

commit 3c777d06900623a01c7e71fab29e130077cb6eb3
Merge: e17e815 5bccc17
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 30 18:58:08 2010 -0800

    Merged trunk.

commit 5bccc17baa40f02605aaaa309a2c0a4b4d50aa1b
Merge: 49913e1 fcfb93f
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 e43355d443b8a5abbdbc3f9d097bf8bddec46010
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Dec 30 17:50:32 2010 -0800

    Removed dependencies on flags.py from adminclient

commit 49913e1bb624e2d1fbd51c812596a891646192ee
Merge: 4909383 ab0fbea
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 ab0fbea1705cf6286849387a56e67d495f2ac35e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 19:07:20 2010 -0600

    Cleanup

commit 4055990efdf83bf9a1e6062b827c5bed7d49207c
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 18:56:12 2010 -0600

    Improved test

commit ea7e518264332e133b47cd82e0a2c4795ed843c9
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 30 18:25:30 2010 -0600

    removed some debugging code left in previous push.

commit 7e4811af9fe9a7681fcdb3f487a5a62996631eab
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

commit f09c588d721614517144240c9414fd247389d4fd
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 30 18:12:57 2010 -0600

    completed the basic xenstore read/write/delete functionality

commit d92883a97a1adc1c9bbb95a196ba24c6c9c51942
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 18:12:10 2010 -0600

    Removed problematic test

commit c1b141bcd001de7dc6ca43afa3d4542b8a8f9dab
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 23:48:27 2010 +0000

    PEP8 fix

commit 53774bb3a5601f5e01ed8032c116fd8fd069e243
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

commit 2f90876a0191c63a12d5e3126508f6bd237d3fec
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.

commit 484b6c4073004a069d8c2a1af5d17fb1a354a92e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 17:02:16 2010 -0600

    Oopsies

commit 1dc5b6687e6fcf413ce6435a3d0e9d911e9ffc7a
Merge: 1383c8b 4909383
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 17:43:37 2010 -0500

    merge trunk

commit d5c17e3fe695ea710ab20ad5d693946c034fb68d
Merge: 7121058 4909383
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 17:43:01 2010 -0500

    merge trunk

commit e43a0a872e0c700d955a853286630697eeec23de
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 16:27:31 2010 -0600

    Make compute.api methods verbs

commit fcfb93fab738652ef373d6cd619487919fca129a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 30 16:13:42 2010 -0600

    Fail

commit 49957b368b8bb56bc14b9d8e65f805e9e29e22d6
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 16:06:48 2010 -0600

    Review feedback

commit 490938363d1cfbc234b92db83d6586dd66860bfa
Merge: 04c6c61 245bec0
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 245bec0549208676c50deaaf8a6da06c28dbeda8
Author: termie <code@term.ie>
Date:   Thu Dec 30 13:31:56 2010 -0800

    change exit code

 run_tests.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 178d6714187e93a1c91c27da49229be05f7cec95
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.

commit e1780fa7b3dc17f08cb90e60a426272ef8294369
Merge: 00b7d65 04c6c61
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:23:14 2010 -0600

    Merged trunk

commit 00b7d65f56fed1aae290c2c7f6e149ceda7bde0b
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:13:32 2010 -0600

    Implemented review feedback

commit 04c6c61e2556075eb9190db6433c0ad4434e3939
Merge: 45775f3 adb1379
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 63359334de8d31ea4a5ccea0ea7e1d263f1fe6bd
Merge: f90ff13 45775f3
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 30 15:02:34 2010 -0600

    Merged trunk

commit adb1379e01af9ef995b83cc8a75fbf81fab5b60c
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 30 14:09:16 2010 -0600

    Calling compute api directly from OpenStack image create

commit 1383c8b308a5876c5ed6bae1c7abcc79ed2adc16
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 14:23:52 2010 -0500

    Several documentation corrections

commit 7a35fb80aee094417d1c103279e7cc93593aa2c5
Merge: 292bcc2 b87c8dd
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 7bb3d4974896275cdab135b60b6fa014dadaea5c
Merge: 02b17c3 45775f3
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 30 17:54:45 2010 +0000

    Merge from trunk

commit ade556bf77ef383b9e532ec5b3ae82d9f56a9fde
Merge: 86f3399 45775f3
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 30 11:26:21 2010 -0600

    Merging trunk

commit 7121058170c55e06b93c987820d10843c1882c55
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

commit 3f211732feb4fcc1e38ef5bff0616bee831ee9a8
Author: Cory Wright <corywright@gmail.com>
Date:   Thu Dec 30 12:10:31 2010 -0500

    Mention Authors and .mailmap files in Developer Guide

commit 6e97daa512e379671d57d6de890a73fec39f9d4b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Dec 30 02:20:31 2010 -0500

    pep 8

commit 4d4ce9dcecc737eda16eae58cd9a1182ea40c756
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 files changed, 0 insertions(+), 4 deletions(-)

commit 06c75c9ecca272ddb3f787f27d694f4177e7250e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Dec 30 01:19:38 2010 -0500

    Clean up how we determine IP to bind to.

commit fde0418b4e3c7569ae3d46d556486af2b9482597
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.

commit 465f00b080ba590635e2146e1b53934c6581fb6a
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.

commit 797e94391c07af77014d4e87b87f77bfc24f02a9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 22:16:34 2010 -0600

    fixed the compute lock test

commit 4dd174bda6b08bf8dca1c657ac29fd33325acf36
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 22:08:38 2010 -0600

    altered the compute lock test

commit 6a047843b797e19ce4f8f323dad4a4eceed455a5
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

commit b3a847290b23ec571e5cf368a0383b85e556f885
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

commit 47aea3e6b815a8e5166b3a8694944d08f201cd53
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 20:52:48 2010 -0600

    syntax error

commit 8ee47abdb759cb2a89f0344e22b4f4db4754409c
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

commit c5ac7d8c4bd52f9ff4347348fe34c4b588d335cc
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 19:27:43 2010 -0600

    removed db.set_lock, using update_instance instead

commit 01a00d04c1d545879d2cb9067ad417a46596ff46
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:57:33 2010 -0600

    added some logging

commit 7636070a493c1191aa31389faec072d9ff8c9ea0
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

commit f2d9b47cce919b46343e4ec3546d2dc1482507a3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:46:36 2010 -0600

    altered error exception/logging

commit 15948e5911e106a89b5441a8968980bc90cae617
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 18:40:03 2010 -0600

    altered error exception/logging

commit 3dab6172d792bbceb2fa87b5e7ba03bece53f3b9
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

commit 5a6b0b37aebc52fb5ac11aeface536308ebdcb99
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

commit 6d43ccdf92973dec1d94249aa8d25a3e3504b486
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).

commit a6889e42bad39cc32fdd10390deeaf2d8be9d70f
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

commit f062fb9626a57b94b3c480717b72f061cc5bd022
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

commit 01ca17f472da802ea6b357ee0742ff6babedbbe2
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

commit 45775f37cb79522809c439547a7ecfb20339d60f
Merge: 8ee144a 0b3eca9
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 c33ca91ccdccc0de366b5ce3f8d88a694f836cdd
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

commit baa223623dd81574445732dc2d7151a206a598c3
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

commit 1fdf0086a6fb886a09a836f1f2a9d8af5eb1ffab
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 17:15:50 2010 -0500

    i18n

commit 9c66f151b40dafe26e9896eab75ff4524c57792e
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 17:08:42 2010 -0500

    Pep-8 cleanup.

commit 0b3eca99f4296de7b06c0fd963e267d8bad4686d
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.

commit 132aeeb185f846b4eb7042404b1aa2dcd36ee4a7
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

commit d613721571a58137245d845e0df3df8e267cb848
Merge: 5a7a577 8ee144a
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 15:13:24 2010 -0600

    fixed merge conflict with trunk

commit 5a7a5772a26ab31d4e4cd7e4330d62e6026f7cab
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 14:32:03 2010 -0600

    pep8

commit ba40692226df74c1e573230572aab8412aa4c908
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 14:30:29 2010 -0600

    fixed up test for lock

commit 5fa9bf9d7e0d21bb8448573a08540d7419aea686
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 29 23:30:08 2010 +0300

    added tests for EC2 describe_instances

commit efffdcca81b2144932a14ca57dbb9a2debf898fa
Merge: d22025a 8ee144a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 15:22:37 2010 -0500

    Merge trunk.

commit 26394c7aaccbafe94bf24e34407b203a6ea67d76
Merge: 056b2e4 8ee144a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 29 15:20:44 2010 -0500

    Merge trunk.

commit f90ff13c03527c36220759c8e97f00cc70590473
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 14:15:04 2010 -0600

    PEP8 cleanup

commit 8ee144a5d6af67fab121f4ab8dd4a168123899a9
Merge: 4a2c353 e62c4d2
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 50f16dd8c20310f0fe9495d53d7819672dcbd053
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 14:02:57 2010 -0600

    Added tests

commit 256da0b097d411e9a6927438e7258c7e6be0e78d
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:50:25 2010 -0600

    added test for lock to os api

commit b1fef0ee5644ee8e346bfd8084b6e7f2b4ca7157
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:33:51 2010 -0600

    refactor

commit e62c4d2eb35cfd939abca7b394b6d52ae68fc5e7
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.

commit 3647e8b6f4d49e43af1ad38d3d44a0ec76ba9969
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:09:49 2010 -0600

    forgot import

commit a4a756717ead191050700444bf4ea38e0a5b2b60
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 29 13:04:41 2010 -0600

    syntax error

commit ddd818e498d4eb217944983a7d945dfeb0ed4b89
Merge: dd454b0 4a2c353
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 29 11:35:49 2010 -0600

    Merged trunk

commit 8c4a5229c0a4a91025b4a13834b342713b8746f2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 29 19:51:25 2010 +0300

    Added implementation availability_zones to EC2 API

commit 86f33993fd84dc4e7f22749501c021bc0caa07b4
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 deletions(-)

commit 868c038bc1134f94578e7bd0f3d6ffd0e2566a61
Merge: 503994c 4a2c353
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Dec 29 17:17:06 2010 +0300

    merge

commit 4a2c353454ad265511a3f269b8c98a98d7066983
Merge: 5853c6c 8ea3d26
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 66a171273070a7af3482d799b2e619eebb4bded7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 28 23:55:58 2010 -0600

    initial lock functionality commit

commit 18b9ea208c96f5c364510cae3c6398fa0a84331d
Merge: b6295fc 81e8a5b
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Dec 28 21:42:17 2010 -0600

    Merged with trunk

commit b6295fca8279fe624af0aeab9ae435fd1c32ec2a
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

commit 5853c6c18d9efe1bef2b8b2d62ba1bc45ee6cad4
Merge: 1b68fb9 8ff5494
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 5faa79e6e1a9799fcd2fb43258b824d5bee4feab
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 18:11:28 2010 -0800

    add ajax console proxy to nova.sh

commit 13a7c492627283c6d9100d51647ea31bcce9c421
Merge: 61602d0 5853c6c
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 18:11:02 2010 -0800

    merge trunk

commit 8ff5494a7e6150f186260c7c4f8992b9b0a3bfba
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Dec 29 01:58:04 2010 +0000

    Fix pep8 violations.

commit 61602d02c3d8aff7df4c296713768e718fe3946a
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 28 17:42:33 2010 -0800

    add in unit tests

commit 8ea3d26140513f8ae4cae4ead908fe2d999f1172
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 17:34:51 2010 -0600

    removed superfluous line

commit 1b68fb9f3959d6fb162f4b0a24108a9fbbb31aa1
Merge: 9bb7dd1 4629506
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 d22025afd11d16b515007a3532e257f6b4834566
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 17:54:31 2010 -0500

    Defualt services to enabled.

commit 4629506d9e0f3331295144c37803bf1b47badde8
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.

commit c613737b8bdce49521186f80b05db6d4fb4034e6
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.

commit 845b37e63cab775d4c506bfe90003fcd8b158f09
Merge: 8003339 5e37d42
Author: Ed Leafe <ed@leafe.com>
Date:   Tue Dec 28 16:02:46 2010 -0600

    merge from trunk

commit ccc8a6d437e99a608486b03736f9073cae9adad6
Merge: 41a5077 5e37d42
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 15:49:36 2010 -0600

    Merge from trunk

commit 9bb7dd1db5f8ba31f2cabd42186592256f2dcd2f
Merge: 5e37d42 c0914f8
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 41a5077ca152c637e437f06fc4966526290cc36c
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Dec 28 15:48:48 2010 -0600

    Whoops

commit 39496e27924b811aaa73d0229c57c94300d28851
Merge: 97051d4 5e37d42
Author: termie <code@term.ie>
Date:   Tue Dec 28 13:43:35 2010 -0800

    merge from upstream and fix conflicts

commit c0914f8cc34a4c4d25e10816fe56264232c71aeb
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 files changed, 2 insertions(+), 0 deletions(-)

commit dd454b020499f43a854db3bed41d7308dfa3fd16
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 14:32:45 2010 -0600

    Make action log available through Admin API

commit 056b2e44a96d968b0d723a8e2dad1dc940c8a52e
Merge: 322fb59 5e37d42
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 15:15:43 2010 -0500

    Merge trunk.

commit 080bbe80784dfe1829f25ea75506479e1adc514d
Merge: 570aefb 5e37d42
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 28 15:11:41 2010 -0500

    Merge trunk.

commit 7372c9689a3d950a6a34e31bb29700b1d5434f66
Merge: ac2e458 5e37d42
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Dec 28 13:01:54 2010 -0600

    Merging trunk

commit ac2e458a9483ffddf68d9295a7780bfa046d1013
Author: Rick Harris <rconradharris@gmail.com>
Date:   Tue Dec 28 12:53:32 2010 -0600

    Add some basic snapshot tests

commit e8a90d03f8a1159245330926d69557064b179d1f
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 12:19:25 2010 -0600

    Added get_diagnostics placeholders to libvirt and fake

commit 526a4a75fec3c58461994a1a5fc3881b98642f43
Merge: 5383c5d 5e37d42
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 12:15:14 2010 -0600

    Merged trunk

commit 5383c5d4144be3b5f267eeaa7eaeb3c397de57d4
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 28 11:49:07 2010 -0600

    Added InstanceAction DB functions

commit 3b50ceb4729965c94e8aa2f78ab39a05aae5d985
Merge: 6bebffb 5e37d42
Author: Cory Wright <corywright@gmail.com>
Date:   Tue Dec 28 10:50:18 2010 -0500

    merge trunk

commit 5e37d429513928317f612a9570e8e2bb5c3ade57
Merge: d6d2d95 d575219
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 97051d4db98c0f9252e48e3b9cd2c285e57b269b
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 d6d2d955e99ecd1dfa4214bbb7333d51e91aa844
Merge: c6793ca 57c7513
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 57c751354351d7a7af4b6380b671d41fb90446d3
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 28 05:14:21 2010 +0000

    fixed a line length

commit 6ed92abbce149f549e357eec8bc698c102bbee9c
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.

commit d575219aa61fbc1df23a42b6313a35c777c0c806
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 files changed, 8 insertions(+), 4 deletions(-)

commit c6793ca2dc1e97deaa56e7d77ba656cfa55c43cf
Merge: 441a164 800fbc2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 28 00:41:22 2010 +0000

    fix bug #lp694311

commit 322fb59040b71d2df5c0a7da8cb4e22b679c0635
Merge: cb739ba 441a164
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Dec 27 19:10:26 2010 -0500

    Merge trunk.

commit 63ff719148b7bae7b39ac1555cd471023d1d4c7f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:35:59 2010 -0600

    Typo fix

commit 8d701516e28c82618d68ce68fb324140fc0772b2
Merge: abcf78e 441a164
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:30:23 2010 -0600

    Merge from trunk

commit abcf78e82f2c648cc4459a3dbd3902f4d898ff49
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 17:29:45 2010 -0600

    Renamed based on feedback from another branch

commit 8ac2c0134952470ab292c36fdbd95ac896cc008a
Author: Andy Smith <code@term.ie>
Date:   Mon Dec 27 15:15:24 2010 -0800

    Added stack command-line tool

commit 659b654a523bae9ddf153d3497e8f4034c6b5d37
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 22:59:08 2010 +0000

    missed a couple of gettext _()

commit 441a1642bd5d64b109822ab33ab2e2bd7f41f4ac
Merge: 3538eb5 2046636
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 d2d2144ffd912f439ec32b022bc1d01c6b0750c6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 15:42:30 2010 -0600

    Fixing snapshots, pep8 fixes

commit 20466364b8846e5e893c0ffb59a7ef73f2681da6
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:39:48 2010 +0000

    translate status was returning the wrong item

commit a3e9b722b387cf68dfd60ce08e4ed6289599a9b6
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 14:23:53 2010 -0600

    Fixing bad merge

commit abca7a3d44fddd1eea5f64392c710b4b398eb6d3
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 12:19:36 2010 -0800

    Converted Volume model and operation to use UUIDs.

commit 8eede653243e40c6e9e8f645b5edf2e098a08d23
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:17:53 2010 +0000

    inst -> item

commit 6ca80cc054d476e674f839d5e71a63d395c8a42b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:11:36 2010 +0000

    syntax error

commit 62e598550f33fc5b2af2c4af9fd6a9ab69043c87
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 20:06:45 2010 +0000

    renaming things to be a bit more descriptive

commit ac882007989cb7f60108a8e4498abeddf266e853
Merge: dab91c1 3538eb5
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 13:45:57 2010 -0600

    Merging trunk

commit e17e81542e751841f25483d7ae51dc3c87fb68e1
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 11:43:17 2010 -0800

    Converted instance references to GUID type.

commit 8844d826305205aea5fb5bce3e28351495652333
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.

commit 2ef917f254b32a1f70c6e50873dc656518f0ea62
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 13:20:37 2010 -0600

    backup schedule changes

commit 70eb94417d2f87c8ecfbbe9104bbcbae49b56fc8
Merge: 74d1df7 3538eb5
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 27 10:50:02 2010 -0800

    Merged trunk.

commit dab91c1267c11de47a30a1a4bbfaca3407f20250
Merge: db722d0 81e8a5b
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 27 12:13:57 2010 -0600

    Merging trunk, fixing failed tests

commit 4a53154889921065b5ff336b367083f935a5551a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 27 12:08:22 2010 -0600

    A few fixes

commit 9ca4968914e6210f75456ed7cc8bea1f5ece203b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 17:18:43 2010 +0000

    removed \

commit 6bebffbbb611febf8bbbf43e120cf0e5c9653895
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

commit 296d343edf57aed8b1b3ca8c34aca263893312e4
Merge: 8738d78 3538eb5
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 27 10:53:32 2010 -0600

    Merged trunk

commit d4a54c70025a4f0299280a0e4cbdbdd2ba3c2844
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 27 16:41:41 2010 +0000

    couple of pep8s

commit 1d6cb73ee7b7ee3a04743a849b6866f60f7c50d9
Merge: 7f0a418 3538eb5
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 27 11:27:46 2010 -0500

    merge trunk

commit 3538eb54934fed1fd3d4e7adfa283e3481f6ece1
Merge: b87c8dd 19a4bfa
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 19a4bfa12602ee60405fee8175a95805b19eb9f0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 27 10:04:25 2010 +0000

    Fixed pep8 errors

commit 292bcc25786b457dedb3da7bb567c379c0f0439a
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Mon Dec 27 17:49:07 2010 +0900

    launch_at を前回コミット時に追加したが、lauched_atというカラムが既に存在し、
    紛らわしいのでlauched_onにした。

commit 800fbc2dd7aa3077a765cf6a39bf00d4e1c75e3d
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

commit b87c8dd12cca567b3930708004577427e5123ec1
Merge: 22efec8 79f1785
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 25 12:47:20 2010 +0000

    Fix Bug #693963

commit 79f1785198d0ef112fdb21c23bd48885780b0bae
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 24 19:17:02 2010 +0000

    remove requirement of sudo on tests

commit 9588f980e569b82e956728baeef29250f188f3f8
Merge: 6f6a1c5 22efec8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Dec 24 18:58:06 2010 +0000

    merge trunk

commit 503994c71d74f1014bf6710a0da7ef0cc13bcb0a
Merge: 860164a 22efec8
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Dec 24 21:07:53 2010 +0300

    Merge

commit 860164afd8ab1e29571268732ed30fde31d80f68
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Fri Dec 24 21:05:45 2010 +0300

    adding zones to api

commit 851809bd24dcf0ab8c287203dd61a03af8512dca
Author: NTT PF Lab <ueno.nachi@lab.ntt.co.jp>
Date:   Fri Dec 24 20:38:49 2010 +0900

    Support IPv6

commit 331be4f196d0dfd290b9a52f13c744f96ed286f0
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:29:27 2010 +0900

    test commit

commit 5a14fa86438021c206d876cc20b67dc721ba23a4
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:06:11 2010 +0900

    テスト項目表を再び追加した状態でコミット

commit 77e3a08ca5b2629458b5321599fecfaa458fef2c
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 16:05:24 2010 +0900

    テスト項目表をローカルから一度削除した状態でコミット

commit f6faf788ff9383af65d0fe710647db9d5655d798
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 15:45:05 2010 +0900

    テスト項目表がなぜか消えたので追加

commit d11dd7f21090c7c2e2562f61f70b76ac3e7b640d
Merge: 3d4c9d2 d273012
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 d273012da993caf2b7273b42ef501d7e95412d41
Author: root <masumotok@nttdata.co.jp>
Date:   Fri Dec 24 15:09:05 2010 +0900

    nova.compute.managerがこれまでの修正でデグレしていたので修正
    CPUID, その他のチェックルーチンをnova.scheduler.manager.live_migrationに追加

commit 22efec8c06c0962eb0e9a54dff4b72804d5ed56d
Merge: 81e8a5b e04728f
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 e04728ffcf997524159309654133334fd20e84fd
Merge: 5c5b303 81e8a5b
Author: David Pravec <David.Pravec@danix.org>
Date:   Fri Dec 24 02:17:29 2010 +0100

    merged trunk, resolved trivial conflict

commit 5c5b303000945dab18991b462f9d9b0527f87ea8
Merge: 55099be ea50f8a
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 524e4b390b29142966b2e4f25327a652437e3751
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

commit f4dc1941d07080c0d275335e1cb0623c4ac0021b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:52:33 2010 +0000

    another typo

commit 11b6df333bc336e38f596a85790bf46d227b8505
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:27:39 2010 +0000

    applied power state conversion to test

commit c07a394e4713dd2bd7d90200f9e88c04ed4cfbb4
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:19:24 2010 +0000

    trying again

commit f83f688eb99c23d7ebc7cae9856950952ae0e643
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:13:03 2010 +0000

    typo

commit 0dc71e387fcc8781cb9a9375a38478eab403de1c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 23:09:58 2010 +0000

    fixed the os api image test for glance

commit 8003339da2b53d04b8d36a5c6f880cfb212188ee
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.

commit 78f02b52dd1a4d4403efa319d7d47a961770afb8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 22:00:44 2010 +0000

    fixed typo

commit df5a6f6e3ec3c54a779b0855dc1cd0c6e71aec86
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

commit 2e1922a8188c953ea13b5416a6c5b3d7b99abaea
Merge: cbf8501 81e8a5b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:53:33 2010 +0000

    fixed merge conflict

commit cbf850145a4f7c78d7cef662db1bc9cf9b097087
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:48:14 2010 +0000

    updated since dietz moved the limited function

commit a7d66ac422c9bfbdeb27d36d763a8f147b856aa8
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

commit 05066702ccae8408bdbd75241d30a5bcf1535b34
Merge: cffc4b8 81e8a5b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 23 21:41:54 2010 +0000

    Merged again from trunk

commit b8747bfa433a2924ecfb0c4722c7bd7c3a4f3395
Merge: d002c69 81e8a5b
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 21:33:16 2010 +0000

    fixed a few docstrings, added _() for gettext

commit d002c6919beeab9007131bbe9a371e1e74414d23
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 20:35:16 2010 +0000

    added _() for gettext and a couple of pep8s

commit e1dbd03080d87652e963bb27e17e0ddd607560c4
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 23 12:04:19 2010 -0800

    adds a reflection api

commit b33ceb7f380b0282a072f4ebc0ba37cfc2ddef8f
Merge: 23812db 81e8a5b
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Dec 23 22:58:20 2010 +0300

    Merge with trunk

commit 23812db0ec922079c0aa6b27aa5f79e5c8a986d2
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Thu Dec 23 22:46:58 2010 +0300

    unit test - should be reworked

commit 81e8a5b56635c06aa3010e016d37daf482f227db
Merge: 2c62d64 3887736
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 8738d78d389e3c8b4656bd3402f8198c17883b98
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:36:01 2010 -0600

    PEP8 fix

commit 38877363b89e174856efcf3445171b4f7fb29405
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 13:30:24 2010 -0600

    One more time

commit ac4aeade9c49800f97749d463a7aac9dbb885705
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 13:17:53 2010 -0600

    Pep8 cleanup

commit 6119e1354aaa3f84f553e88795938f2e8d862a03
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:14:56 2010 -0600

    Resolved merge conflict

commit 907c819cce0bc983590cdfcb63d437a50a415ed1
Merge: af356c0 2c62d64
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 13:10:38 2010 -0600

    Merged trunk

commit 2c62d641198240176fe9d74f664841cd648e56ac
Merge: 068664d c9796a3
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 c9796a39536ce93f28a8b81fb3fd76be5883ce18
Merge: d41bfa5 e80d452
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 23 10:33:05 2010 -0800

    Merged Monty's branch.

commit d41bfa56f274d13306e913ad283a77d1b07136f4
Merge: a0e1e99 068664d
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 23 10:31:46 2010 -0800

    Merged trunk and resolved conflicts.

commit af356c04f34816c20ac46211dd603227cbf852bb
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 12:23:28 2010 -0600

    Working diagnostics API; removed diagnostics DB model - not needed

commit ff4006ab6c149d00deba65545e416bbf6a5a4d9d
Merge: 56e26d0 068664d
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 23 12:07:42 2010 -0600

    merged trunk

commit e44a992b6fd951abf1f4ed50c5cd567636adbfa4
Merge: 9e8821a 068664d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Dec 23 12:06:00 2010 -0600

    Merge from trunk

commit 56e26d099e358e841264e9f531d4fbb134ae89bd
Merge: c6fcaca 9396f87
Author: Ed Leafe <ed@leafe.com>
Date:   Thu Dec 23 12:04:42 2010 -0600

    merged trunk

commit 9e8821a1691a1dd802068bd72f3e276dd51b9d4e
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

commit 068664db3c876c50a6386eb68d9cf257005bf403
Merge: 0eb894e f1b59a5
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Thu Dec 23 17:46:59 2010 +0000

    Simplifies and improves ldap schema.

commit 0eb894ee689bda4db5b245771d94f25844311ab5
Merge: 98626d2 f8c7cfb
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 17:27:02 2010 +0000

    xenapi iscsi support + unittests

commit 3009bbc67f1e3c5ad5ae09f58d8ab00cfbbde121
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 11:22:51 2010 -0600

    Fixed trunk and PEP8 cleanup

commit 1fbd484ef3edebfe22b1eff0638c8a9f2b6011ee
Merge: 344eb8d 98626d2
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 23 11:11:18 2010 -0600

    Merged trunk

commit e80d4529fa2d2ff8811e12d5083b732c4f8092a8
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 files changed, 1 insertions(+), 0 deletions(-)

commit deb5ebf1854094235801c72c43e6954375f9bdb2
Merge: ee8e028 f8c7cfb
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 13:16:47 2010 +0000

    merge lp:nova

commit bb694db07f47c30daf81c7ba6406defc6eb86435
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:32:15 2010 -0800

    better bin name, and pep8

commit 79ef9d6cfd8cb58ad2ee75925ad2da1e803e6fcc
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:26:03 2010 -0800

    pep8 fixes

commit 8b1910924b34c706d45340452a21963a7e210333
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 01:22:54 2010 -0800

    some pep8 fixes

commit 587f1ae9df3760bfb64a06b2447e2dc79cdf55f8
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

commit ac61c7c0fe8cd41a743060dbe8729a3d91a3c253
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:43:15 2010 -0800

    add license

commit de53741afeafb6e3fd55d2a8ebb10646f2bb6e72
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:41:21 2010 -0800

    delete xtra dir

commit 45401a757be51b1e9873aee8381113f915985a07
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_additions/euca-get-ajax-console |   96 ----------------------------
 1 files changed, 0 insertions(+), 96 deletions(-)

commit 2d28b83f3e0700c23915805b04ce3ad4416a74fa
Merge: 8ce8d50 98626d2
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:38:11 2010 -0800

    merge trunk

commit 8ce8d504579b5c39439c30a129d50231ca0b35c6
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Thu Dec 23 00:23:08 2010 -0800

    move port range for ajaxterm to flag

commit 7c71f05ea148d18908b92a6a4a5294d30bef9541
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:49:10 2010 -0800

    more tweaks

commit 15f7220cca7b27c05d3fa237a62f85d8de43f79f
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:47:46 2010 -0800

    add in license

commit df78e2f69387478427be3217abac80c217cf4d0e
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:46:21 2010 -0800

    some cleanup

commit 6f7bd74223b14b1f724f85d78fa2f8a544b30724
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 23:41:07 2010 -0800

    rewrite proxy to not use twisted

commit 12699a2a5fac5de08bbfcddb441620f1b1c011e5
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

commit a3f69e160e80e0b0b90c1c73ff9a1737461a22a8
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 23 06:48:15 2010 +0000

    added suspend as a power state

commit f8c7cfbbd5709c4422e5e067b6c49c5aac960379
Merge: cb245ef 98626d2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 03:36:13 2010 +0000

    last merge trunk before push

commit cb245efd9eaa1c8d6ef5e61424e6b1388bd85709
Merge: 5ac60b7 dee5803
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 6b4071a97ea4f07915e3310251e7f05f43a97416
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 21:14:06 2010 -0600

    And the common module

commit 9417401e3957cb78d2196dcb6ef3f7ccf3b918dd
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 18:52:43 2010 -0800

    minor notes, commit before rewriting proxy with eventlet

commit 98626d204239495e3edd97f8b8637ab21605e5b4
Merge: dee5803 882c851
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 5ac60b7e6098463d75b07f5030fb188eb673654e
Merge: 9c4d42e 2f30502
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 23 02:09:50 2010 +0000

    first merge after i18n

commit 949271485e55da12476d460b0573d82b2c9d3fc1
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 18:04:35 2010 -0800

    remove some notes

commit 882c851979af94d197e83ce16e3525c500d761bc
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 f3b377f4151267aa4bec91837b20e9b9e110b415
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

commit 16e0fa0087d2c226880fcffb364d249d7f8144f0
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 files changed, 2 insertions(+), 2 deletions(-)

commit dc8b295e829da4b9caed2a5d8d41537fee27f83e
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:52:16 2010 -0800

    remove some yields that snuck in

commit d445ad02c8a90b47c9a1052198acbd8cb64f4191
Merge: 31cae5d dee5803
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:50:08 2010 -0800

    merge from trunk

commit 31cae5dbddb37efb662132f5cfe11fc9091c9647
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 22 16:43:47 2010 -0800

    Basic Easy API functionality

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit dee5803e5a2817aef84016d7444b177b5cab4a62
Merge: af3dcef 143837f
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 143837f7d393e5942ccafc487f05f9398de243bc
Merge: aa204d5 af3dcef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 23 00:30:52 2010 +0000

    merged trunk

commit af3dcefd22264952825ce0c24396829560d27f65
Merge: 90c9cdf aa204d5
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 90c9cdf2ed8449ea64fd2d14d9809f8e7cea8920
Merge: 9396f87 2831159
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 f1b59a53fb1ebb8fe333cd62e90d60693c038431
Merge: 8146968 02b17c3
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 02b17c3c0fc024c4dfe021f7686046bfc69af7c5
Merge: 1a16936 9396f87
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 22 23:44:05 2010 +0000

    Merge from trunk

commit c6fcaca05b822a93f804145a4d5bfc170dfbdc81
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 17:33:21 2010 -0600

    Got basic xenstore operations working

commit 344eb8df29e37baba1d69590ca0ec3fbf1682465
Merge: 725087f 9396f87
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:16:01 2010 -0600

    Merged trunk

commit 725087fed5d264440663823ce2ff045ce2bf482a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:09:46 2010 -0600

    Modified InstanceDiagnostics and truncate action

commit aa204d5d1cf5421f88d9e0e392c1c446d992c4ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 22:54:43 2010 +0000

    removed extra files

commit 96aa0b0aa7c2f989907df053c5d887523e15a7e0
Merge: 49d1148 9396f87
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 22:54:13 2010 +0000

    merged trunk

commit 9396f87e231f9dceb949c004f2044254ef53720c
Merge: a2a1cca 0eb389b
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 0eb389bf9c2112a2dc02aa129afc5e9e413e691f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:55:11 2010 +0000

    pep8 fix

commit 2831159351edac943d7cbb1f2d81f3fb3562695e
Merge: 4cbb1de a2a1cca
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:50:58 2010 +0000

    merged trunk and fixed conflicts

commit 55f095344a50ece833829c70b2838b5eaa9438fa
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 15:50:26 2010 -0600

    Accidentally yanked the datetime line in auth

commit 4a0b26bc257da2fe7a9d9534587c42df81ba892c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:41:40 2010 +0000

    remove extra files that slipped in

commit a263220e5b3b2984d5cf8c516ac41b835c58324a
Merge: 4b90fa9 a2a1cca
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:38:44 2010 +0000

    merged trunk

commit 4b90fa90217af597663a144246482949600887de
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:38:06 2010 +0000

    add missing flag

commit a2a1cca118eb92008651a1fcdd5a13750e497b4b
Merge: 35fdb47 9fa0fea
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 ea12e84c7fa3c26cfed6b5bbb13687b4cc26b0da
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 13:31:33 2010 -0800

    use libvirt python bindings instead of system call

commit 48aea1172a24330b1f6e705e607927a1b0952920
Merge: 6c64c00 35fdb47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:21:56 2010 +0000

    fixed more conflicts

commit 9fa0feaad19d6f8f5c4c1a7135dbbd0efe0f6d8f
Merge: 0831199 35fdb47
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 21:17:30 2010 +0000

    merged trunk again

commit f09b5ca71a6a434aed273dd6cf899d97d671a9c3
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 13:00:20 2010 -0800

    add in support of openstack api

commit 08311995b4f1be08003183ae633666c14ed1d7b6
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 +-
 tools/pip-requires |    1 +
 4 files changed, 5 insertions(+), 1 deletions(-)

commit 490f4511be17a07a4f05487dacfae183829252c4
Merge: f0bd14d 0a79943
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:59:16 2010 +0000

    Optimize nwfilter creation and project filter

commit db722d044135366323c61c22b677fdd144f09900
Merge: a70ccf6 35fdb47
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:58:02 2010 -0600

    Merging trunk

commit 6c64c00734da78cda22f13ee45683a63af61eef3
Merge: 638732c 0a79943
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 20:54:58 2010 +0000

    fixed conflicts

commit a70ccf6354092a03de8d2c144414f7a428d65613
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:54:02 2010 -0600

    Adding more comments regarding XS snapshots

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b424f7bc7af168fd3b6135c29bef543958e23eae
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Wed Dec 22 12:36:37 2010 -0800

    working connection security

 tools/euca_additions/euca-get-ajax-console |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 35fdb4766d23f628cadafc4927705d642967838e
Merge: 6d667b2 b172643
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 6d667b2cca5053147cf69bbf0403cd4cb0912108
Merge: 6d29ba5 26f958d
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 6d29ba5594cb4f7975bb97df3bc61ab4d114df2c
Merge: c820568 5e93bba
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 a84f4dc03cdf4f22b73dc756ba4631a2cf6adc39
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Dec 22 20:06:22 2010 +0000

    Forgot the copyright info

commit 51deb4ac94521bdd2150b3546ba8f0f5591c42f8
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 14:00:31 2010 -0600

    i18n support for xs-snaps

commit 37ce63873be9c2aac3cd6d901138ae5b9eca1d7c
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

commit af01353dac81437e190a0a3132de1fafd5d1c8a2
Author: Ilya Alekseyev <ilyaalekseyev@acm.org>
Date:   Wed Dec 22 22:38:50 2010 +0300

    Zone scheduler added

commit 981060a3cc712c51d75cffa899af4ee7190b8cdc
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 13:33:26 2010 -0600

    Moved some things for testing

commit 22190c9ec8ce7a8bca8e73a28400f604c0b259e5
Merge: ed209fe c820568
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 13:20:32 2010 -0600

    Merging trunk

commit 48a886e4557ce4b4ac200f9a63f5256ae0b71047
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 13:18:26 2010 -0600

    Abstracted auth and ratelimiting more

commit ed209fefb305ed17951dfa93e8efaef1485d8a7a
Author: Rick Harris <rconradharris@gmail.com>
Date:   Wed Dec 22 13:01:33 2010 -0600

    Getting Snapshots to work with cloudservers command-line tool

commit 7f0a41874dad12d2a825026428e3db43a838657d
Merge: ac1360a c820568
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:53:36 2010 -0500

    merge trunk

commit 491d4384b811d3c7caa5b2a553ae0d306f70bd4c
Merge: c5d3100 c820568
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 12:44:59 2010 -0600

    Merge from trunk and resolved conflicts

commit c5d3100da1457e42f2445c4773d03db847125453
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Dec 22 12:39:59 2010 -0600

    Minor bug fix

commit c820568b50bfb73cc6161ca7eca9dd8db6e48ee7
Merge: 8e485d9 84b78fb
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 ac1360a2e23bce373cc7579acab46d090d4de34d
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 files changed, 2 insertions(+), 0 deletions(-)

commit 8e485d92c94d90d44333f80ec9fda3e210cc0c06
Merge: 2f30502 0e93c4a
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 7ea76fae7e1890866add2658531d7ecc3aa4dd55
Merge: 31ca6a8 2f30502
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 13:19:21 2010 -0500

    merge trunk

commit 31ca6a883c4b2fb1d21b7352a76d114a1314d2b7
Merge: 94b283d 40c5355
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 0e93c4a1cf11c943f71f0d9664f203d68c9d9c9e
Merge: 706b79e 0a79943
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 22 17:31:26 2010 +0000

    merged i8n and fixed conflicts

commit 40c53556671f9e980094916f68ce23e9a2081b57
Author: Antony Messerli <ant@openstack.org>
Date:   Wed Dec 22 11:28:08 2010 -0600

    Added networking protections readme

commit f8def88338afc6e1ab15518550aea7fc77dc2967
Author: Antony Messerli <ant@openstack.org>
Date:   Wed Dec 22 11:27:23 2010 -0600

    Moved xenapi into xenserver specific directory

commit 621f4f5de8d7c499864f712b95bc328a7855c698
Merge: 93a0130 0a79943
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 11:24:28 2010 -0600

    after trunk merge

commit 2f30502ef4aac8fab12d9629da3d261db1865f5e
Merge: 0a79943 e7c494b
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 17:23:55 2010 +0000

    Fixes documentation builds for gettext...

commit 93a01309b9c4d908bafc74a394784d2bdea0ce3a
Author: Ed Leafe <ed@leafe.com>
Date:   Wed Dec 22 11:20:30 2010 -0600

    committing so that I can merge trunk changes

commit 0a79943e00c495c47a89de2611ceca443d94457d
Merge: 234c46a 6a6cc70
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 17:09:00 2010 +0000

    Log all XenAPI actions to InstanceActions.

commit 6a6cc7079337a977d7ab666088338a655f3d5f99
Merge: 31d11a6 234c46a
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 22 10:43:40 2010 -0600

    Merged trunk

commit 94b283df23853ccd6b154d54e4bda01c6e428f9e
Merge: adec6ae 234c46a
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 11:28:25 2010 -0500

    merging trunk

commit adec6ae6349428d46f567e847e9668f238cb47ee
Merge: 4d324ae 55099be
Author: Cory Wright <corywright@gmail.com>
Date:   Wed Dec 22 11:28:20 2010 -0500

    merging trunk

commit e7c494bfd8d36e9a4ae7bfcf53a579833d6a0a0c
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 11:12:20 2010 -0500

    Fix doc building endpoint for gettext.

commit 234c46a4cc103689f4a2c3ee19981ce79f9ea853
Merge: 55099be 818a722
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 818a7221a7dae3fd907dd426a2d360b27c2aa538
Author: jaypipes@gmail.com <>
Date:   Wed Dec 22 10:40:24 2010 -0500

    Problem was with a missplaced parentheses. ugh.

commit 84b78fb3112d40a5a25dda822e8393fb502b850e
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Dec 22 13:52:44 2010 +0100

    Adding me in the Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 111634eb3c23270f62db972ab2b19d20ed817e25
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

commit e1ea5066f7999444669f608a5dad2853164dc3e9
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

 tools/euca_additions/euca-get-ajax-console |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 1dd202c49123bb197c35ed64e895e85882663905
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 files changed, 0 insertions(+), 1 deletions(-)

commit 99c6d86f46b49e4247d871060f8d3dc273a63470
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 23:15:00 2010 -0800

    a few more fixes after merge with trunk

commit ebf1b5a5e43957f4d43689e84a8e3842808c7694
Merge: 05916f5 55099be
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 22:01:51 2010 -0800

    merging in trunk

commit cb739bad9083202a09aa01a44682c7810b2c1160
Merge: ef3491f 55099be
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Dec 22 00:09:18 2010 -0500

    Merge trunk.

commit 05916f52edbad78ca0a1661cf509677ffb2617a2
Author: Anthony Young <sleepsonthefloor@gmail.com>
Date:   Tue Dec 21 18:20:55 2010 -0800

    move prototype code from api into compute worker

commit 570aefb8d6528bc6b1b43f4201b8a1cab3a49efc
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.

commit 31d11a6bbd187c7cbecf0a5f1f2e9ae12ad44cd8
Merge: ac8d0c1 55099be
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 17:06:24 2010 -0600

    Merged trunk

commit 55099bef16d8159001727fb7ab8e6777bf50da99
Merge: 22627ed 31f6e5a
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 348ecb83729f3e056086549a97c738833aaeb18b
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

 tools/euca_additions/euca-get-ajax-console |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

commit ac8d0c137a5f1cd584ed7ae03aceb46bfe7d0135
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 15:56:12 2010 -0600

    Style correction

commit 49d114801d41432b4c2e2ce87576cb0cf6deb96a
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

commit 8b0d7651f185d4a01d3efed5e1bba81a8bd24caa
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 15:46:44 2010 -0600

    Filter templates and dom0 from list_instances()

commit 638732c3139f5499333495297d70f10d164adbf2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 21:34:51 2010 +0000

    removed unused import and fix docstring

commit e11b8784583df23641f3214190017e93a085efef
Merge: a90f529 bb6ed3b
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 bb6ed3b52e6bac22b8b40ce61ad57171f67a9403
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.

commit 1e8303b6a19abbfb830697e440895457eae3ebe5
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 14:28:20 2010 -0600

    PEP8 cleanup

commit 5c6c2b8253a77c95c47c157593ad2d366337b0c8
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.

commit 12f5655d69a683dd294e78ec58aa7a8227aba720
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 14:13:18 2010 -0600

    Log all XenAPI actions

commit 3d0ade21d0f541e86f3e12d02178e42e96bfe670
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 21 20:06:53 2010 +0000

    correct xenapi resume call

commit a90f52930b70cd864ad35981c9d28ec3b56c1876
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 19:24:12 2010 +0000

    activate fake rabbit for debugging

commit b82e5df9057d3c3d4383790becb3bbf964d368fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:57:11 2010 +0000

    change virtualization to not get network through project

commit 706b79e401611c9ec141617338c1fb7d71461ccf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:48:07 2010 +0000

    update db/api.py as well

commit 7a81ab11107a91cf4d047c58a4df621d8d335b7c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 18:43:41 2010 +0000

    don't allocate networks when getting vpn info

commit 22627ed18c8f812f28dbe6870838749a6d4abb64
Merge: 9816b26 fcde293
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 17:59:50 2010 +0000

    Added InstanceDiagnostics and InstanceActions DB models.

commit 377533d63654f460f802be5623e4190132201c7e
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 11:42:25 2010 -0600

    PEP8 cleanup

commit fcde2932a1df8f9688f33169094c4b499fa61ce0
Merge: 928adfe 9816b26
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 21 11:12:47 2010 -0600

    Merged trunk

commit 521daf200d6a2cc81060ddf759c061a5b6d27394
Merge: e65a0c2 9816b26
Author: jaypipes@gmail.com <>
Date:   Tue Dec 21 10:25:39 2010 -0500

    Merge trunk and resolve conflicts

commit 9c4d42e4818513ec367c3305a8eefc4918f09fad
Merge: 8d17887 9816b26
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 21 12:08:20 2010 +0000

    merge trunk

commit cffc4b8c48961c2254fd0f340e8f81ded09d2a28
Merge: c1ba028 9816b26
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 ef3491f6bb951fc1cca7ec0c5cad915388080564
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 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

commit 48b7be6eddfe1fb8fba067e47726e1e01dbaf219
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Dec 21 01:41:28 2010 -0500

    Use paste.deploy for running the api server.

 etc/nova-api.conf  |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/pip-requires |    4 ++-
 2 files changed, 65 insertions(+), 1 deletions(-)

commit a6b1b8579eb9e9e502a686f7a3004fec18fca6b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:43:47 2010 +0000

    pep8 and removed extra imports

commit 8c50336b1db8386d17b084d7c6828f1e1d55777a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:39:28 2010 +0000

    add missing greenthread import

commit ec17eed981885f9134fa958498d5fc0dd1b1a553
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:34:30 2010 +0000

    add a few extra joined objects to get instance

commit 311824da18500a32804875aeb15339411a21034e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:26:50 2010 +0000

    remove extra print statements

commit ae8793d529efd8455af96168e52bf3568a285cfc
Merge: 6117bc3 26f958d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 21 03:21:07 2010 +0000

    Tests pass after cleaning up allocation process

commit e90c1ae4364a11399f2f61acc9c47111d4879da1
Merge: 0cf07a4 9816b26
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Dec 20 18:00:26 2010 -0600

    Merge from trunk

commit 8e8b6ab64dcfaf963cddc6bb81d7b9d30d01e93f
Merge: 2520fbc 9816b26
Author: Rick Harris <rconradharris@gmail.com>
Date:   Mon Dec 20 17:36:36 2010 -0600

    Merging trunk

commit 2520fbcf678789e36768def0972f12873ea07998
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

commit 4d324ae1d961a7fcf8d3b8e3de4fc54fd0460746
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 20 18:15:40 2010 -0500

    Close devnull filehandle

commit bf381a27079e497b95caf63133d5c431480e4378
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 20 22:55:11 2010 +0000

    added suspend and resume

commit 60bea9878c13e83a24bf1d4cade4c02523698328
Merge: 52c28cc 9816b26
Author: Cory Wright <corywright@gmail.com>
Date:   Mon Dec 20 17:51:56 2010 -0500

    Merge commit

commit 52c28cc79c48c3522be8eb41003fd44c7eefac91
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.

commit 9816b269c40cc321debad5589d4131800d9c1521
Merge: 62c17b5 cc8ec2d
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Dec 20 22:04:12 2010 +0000

    Add raw disk image support.

commit cc8ec2d1a3ac2dbe927c3d62a3c8cac6cfcf9f46
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 files changed, 1 insertions(+), 0 deletions(-)

commit f6cc2d061306f520e60662341ffe251a200f4aeb
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Mon Dec 20 21:12:20 2010 +0000

    fixed some pep8 business

commit 6117bc3c9ff261cb04cf32bae4b80e919130c3d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Dec 20 21:04:54 2010 +0000

    directly copy ip allocation into compute

commit 78a627ee1984557e9627f97a0671c15c275b1b6d
Merge: 8966373 1709f6d
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Dec 20 14:54:27 2010 -0600

    Minor spellchecking fixes

commit 62c17b5ee67d2c49451b63eb7d947bfac8222901
Merge: 1709f6d fce4189
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 928adfee10d7ba3219bc1cd712764eb3c96333dc
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 14:21:01 2010 -0600

    Make column names more generic

commit 31f6e5a2cf005ee4f3bbc950b2ccbf632a2bfe93
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

commit d4e5269a323e1ac9ea811faa04e74666d719cac7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 20 20:37:56 2010 +0100

    PEP8 fixups

commit a617ac6a09a261d1755e320c97a7fe53e7891dd2
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 11:31:21 2010 -0600

    Added InstanceActions DB model

commit 947745c46de56d7abcc4b1c7ccf6daa293e90dbd
Author: Antony Messerli <ant@openstack.org>
Date:   Mon Dec 20 10:56:10 2010 -0600

    initial commit of xenserver host protections

commit 852326762eab517b04895c387277f659ce4fd93c
Merge: 6bef08f 1709f6d
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Dec 20 10:41:54 2010 -0600

    Merged trunk

commit c1ba02811872d89a05a9f8ec052dae44a758d179
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 20 15:41:43 2010 +0000

    Fixed pep8 errors

commit 8e427bf95fce90905164b7095251773eb4ca4439
Merge: 9e701a5 77cd405
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 e65a0c2c8f85caa83498389a5539ebe9eeb98d40
Merge: 985add2 1709f6d
Author: jaypipes@gmail.com <>
Date:   Mon Dec 20 10:15:07 2010 -0500

    Merge trunk and address ttx's review comments

commit fce41897ac408735fc4027b45696246459cc2aa1
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Dec 19 22:14:36 2010 -0400

    pep8 (again again)

commit 297284c4748342ed60a1960ea797e21e4e9d6759
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Sun Dec 19 22:05:46 2010 -0400

    pep8 (again)

commit 40e8dda44c9679d59183b224088da33200bde564
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Sun Dec 19 23:51:17 2010 +0000

    small clean up

commit 7619ee2847b2993846a60c569c5fa3e566591075
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も変更

commit 3d4c9d219921adde18ce02669954b9422343f225
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も変更

commit 4cbb1de31efea00e551bbb27444fe0331e7f5e1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Dec 19 20:05:41 2010 +0000

    Support proxying api by using X-Forwarded-For

commit ee8e02855c5efe1876a8001bfe9f915eb44013b9
Merge: 6f6a1c5 8d17887
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Dec 18 13:58:26 2010 +0000

    eventlet merge updates

commit e3b36a98c33d47757c02ab0150f592c9677906bf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Dec 17 19:17:39 2010 -0600

    Cleaned up TODOs, using flags now

commit 8d17887dc8fb6195fa049f04801e0eaf12371be8
Merge: 1f0f643 1709f6d
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 1f0f643d8603944c2b82f5198aa19d436e739001
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

commit 0cf07a42469aae067c5975f0541f44588b39e6b0
Merge: 18be56e 1709f6d
Author: mdietz <matt.dietz@rackspace.com>
Date:   Sat Dec 18 00:18:36 2010 +0000

    All API tests finally pass

commit 77cd4050b660ea950f4832f1bcc9e0f90c06370e
Merge: b0293f0 1709f6d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Dec 18 01:00:13 2010 +0100

    Merge trunk

commit 1709f6d874f47c8bf6a266c93b0f396644ada946
Merge: 9c98224 ccf8b95
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 23:54:37 2010 +0000

    Removing unneeded Trial specific code

commit 18be56e5bbd8bafc6a1c39e9ee3c3b9feab3e7ce
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

commit 8966373c84df700ba0c036893ec14af9675a4108
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

commit ccf8b95e863b8c90c5312e48b5838eeb512546b9
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 16:29:55 2010 -0600

    Removing unneeded Trial specific code

commit 9c98224f286f801fdb8c17e284791bfaa02e3eda
Merge: 0f0955e ff9d97f
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 0f0955eedbfaee1af1272b3e00c13485bca52aac
Merge: f0bd14d dc6836f
Author: Jonathan Bryce <jbryce@jbryce.com>
Date:   Fri Dec 17 22:09:01 2010 +0000

    Adding Ed Leafe to Authors file

commit a767bb35bbd4cfb8d2af485df0ddd67266febb83
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 16:03:21 2010 -0600

    Some tweaks

commit dc6836f4158b2409911a55471634d459942a5e02
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 files changed, 2 insertions(+), 0 deletions(-)

commit 1a16936d8f774c8cbf5bbabbb8494fffbf69b706
Merge: 05fbd3b f0bd14d
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Dec 17 20:55:54 2010 +0000

    Merge from trunk

commit 9be178cea4fb50ed04314840d187248e0a3d16cf
Author: Rick Harris <rconradharris@gmail.com>
Date:   Fri Dec 17 14:21:03 2010 -0600

    Add wait_for_vhd_coalesce

commit 9197f9d98d7b9b19fa297643a1f50828ae57df03
Merge: 47a0421 f0bd14d
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 12:10:10 2010 -0600

    Merge from trunk

commit 47a0421d658b1e1a987159fa6478151a4fca4f5e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Fri Dec 17 11:54:59 2010 -0600

    Some typo fixes

commit ff9d97fcb1a33ebb2fa3442a8b8424e3323f014d
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:24:06 2010 -0600

    pep8 cleanup

commit 59c3f7fdd31e08478194b590e3c86d9fb67a6adf
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:14:32 2010 -0600

    Fixed some old code that was merged incorrectly

commit b398230073adb3a732cc18430e9d0b7561b0bfe0
Author: Ed Leafe <ed@leafe.com>
Date:   Fri Dec 17 11:07:59 2010 -0600

    Replaced redis with a modified dict class

commit 9e701a53049defbe409691ebcce5cc3eaf1e6c52
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 16:41:35 2010 +0000

    bug fixes

commit 985add2318ae252b0c5852f6b072a8cf9c9cec55
Merge: f1f6fb3 f0bd14d
Author: jaypipes@gmail.com <>
Date:   Fri Dec 17 11:10:11 2010 -0500

    Merge eventlet and resolve all conflicts

commit d3ac9a4f7cf94778e5c9d82c807e18bff6e8d5fd
Merge: f8c1632 f0bd14d
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 7d8653f10b5509d67552f1d63b0226ed9c41c2d6
Merge: fd0f7fd f0bd14d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 12:25:30 2010 +0000

    Integrated eventlet_merge patch.

commit b0293f0861c890d44f7d88feac8ec1b75ed4e177
Merge: cf7dbe0 f0bd14d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Dec 17 13:07:43 2010 +0100

    Merge trunk (naïvely).

commit fd0f7fd9ad96bcc89ff34d9d791582a8dbdaa589
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Dec 17 11:49:00 2010 +0000

    Code reviewed

commit dfb3e61315cd0c7c2dec133f89354882713ae51f
Author: Rick Harris <rconradharris@gmail.com>
Date:   Thu Dec 16 20:59:27 2010 -0600

    XenAPI Snapshots first cut

commit a0e1e99b5bdfc27a43b272d0eb2c6319cf8fda21
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.

 run_tests.sh |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

commit 97aa10277302de01590ae991c379cc474407b62b
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.

 run_tests.py |  125 ----------------------------------------------------------
 1 files changed, 0 insertions(+), 125 deletions(-)

commit 5e93bba737f77022b6ed5051344a209c911e16c7
Merge: 8bab5e5 8e37df6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:52:54 2010 +0000

    remerged for pep8

commit 8e37df6ae6737e41ba20d532e4fdaeef5e2c32b3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:52:17 2010 +0000

    pep8

commit 8bab5e5aade584f3c47dde7abedb22f09ebccf97
Merge: e334d37 4ffcfa8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:45:35 2010 +0000

    merged in project-vpns to get flag changes

commit e334d37e0da9241c20327620c3e69c8464f99530
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:44:08 2010 +0000

    clean up use of iptables chains

commit 4ffcfa868b10e20f75f97f27b2ce82bbbef8ab29
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 17 00:43:18 2010 +0000

    move some flags around

commit 26f958db43e58e0dbef631b87b511e5120eac156
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 23:47:14 2010 +0000

    add conditional bind to linux net

commit e3fe9dd7134bb97b79256b35f0e8290b6f501568
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

commit b1726436c0839f8b9e36123d1e4ccf2577a33eb6
Merge: 0dbfa8c f0bd14d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 22:57:36 2010 +0000

    merged trunk

commit f9ba813ffc3d3fcc72d892fe32e85a4edcb799c4
Merge: d4e7044 f0bd14d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 22:52:08 2010 +0000

    merged trunk, fixed conflicts and tests

commit 6bef08fe965986d80ad1a2299a0e64340053080f
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:54:38 2010 -0600

    Added Instance Diagnostics DB model

commit f0bd14d1014bd0fce33141bd932856d6b8036c96
Merge: 99d7b05 9378f24
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 9378f2416d4341f7532d156aece611b37697665e
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:19:35 2010 -0600

    Removed unnecessary blank lines

commit 6ab1f89804fd91eee37c1a43f24504dd61cbcc3d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 16 15:03:37 2010 -0600

    Put flags back in vm_utils

commit 99d7b05f1b1480bbee29a08708d53d04b3c0bb34
Merge: fa4ae14 6e9e64d
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 6e9e64d6b44c8618a32bcb9e691aa4518ed95d02
Author: termie <code@term.ie>
Date:   Thu Dec 16 12:45:06 2010 -0800

    pep8 fixes for bin

commit f1f6fb3b5df111b556f7128a1d084b7c2122dece
Author: jaypipes@gmail.com <>
Date:   Thu Dec 16 14:47:42 2010 -0500

    PEP8 cleanups

commit d4e70441c99f25efd488c7b4468538af4486c87a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 16 19:13:37 2010 +0000

    use getent, update docstring

 CA/genvpn.sh |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

commit 3e08a3c29fa9da7b6fad1909df364d283e7cef94
Author: termie <code@term.ie>
Date:   Thu Dec 16 10:52:30 2010 -0800

    pep8 fixes

commit f8c1632632c5cdf51184519b525c23375f465f72
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!

commit 32130942cf10a6241d9f7b872d5fbf72ad756cf7
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:17:53 2010 +0000

    fixed a couple of more syntax errors

commit 0e90d374f6933d8f6ee3b443e99ec9023ff52098
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

commit 3bc24fc3a65c60843b4624d8cf5a132ba795593c
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:09:25 2010 +0000

    typo

commit 7484864c3c6fa770821a8d43fb916e722e103401
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 16 18:01:21 2010 +0000

    fixed up openstack api images index and detail

commit 53f1202b80398f5e70e4398d1599a1225990dabc
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 16 17:47:48 2010 +0000

    fake session clean-up

commit 8f256dabbc9c047359660b1ed11aaeb3f982f7f3
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

commit 8c65041a8217f7d84671cda164f523af151d7092
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Dec 16 12:22:29 2010 +0000

    removed extra stuff used for debugging

commit fa1727f15a79c7ce89461a54366832b7f06e4fb4
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.

commit ea50f8a7bf1c160bad9042c988474eedd743e4b1
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 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 814124d1897e87d6eb65a9a0722081b7883dd871
Merge: 9e7ea01 fa4ae14
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 17dffeefc63cc046633f4ebac28502fcdfc4ef67
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Thu Dec 16 18:20:04 2010 +0900

    Hostテーブルのカラム名を修正
    FlatManager, FlatDHCPManagerに対応

commit f57cdef72f996f23578e7a6453be98cfbe733c08
Merge: e440ade 99d7b05
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Dec 15 20:31:32 2010 -0400

    merged with trunk. fixed compute.pause test

commit e440ade7746165a4e5e64c28609979fe041d742f
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Wed Dec 15 18:23:51 2010 -0400

    fixup after merge with trunk

commit 0dbfa8cc4bb27771e340eb6d36e8ffc50337eb1a
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 13:14:28 2010 -0800

    memcached requires strings not unicode

commit fa4ae147e22ec2e54d3da9049a02cc6e69b51dab
Merge: 393876b f651733
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 573f7f4c0fa24ad32c24c63fe6015fc1d9dc83ed
Merge: 5ecf9dd 393876b
Author: jaypipes@gmail.com <>
Date:   Wed Dec 15 15:14:09 2010 -0500

    Merge trunk and resolve slight conflict

commit 393876b845c986ff58c267193ebe6c8736c28392
Merge: 0f32417 53670ec
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 49318c5e9202e0fb3cc8e055e9538d4eea895a91
Author: termie <code@term.ie>
Date:   Wed Dec 15 11:53:18 2010 -0800

    fixes for xenapi (thanks sandywalsh)

commit 58a97ca417773ba0fd4078dfde1e46824e553c20
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 11:23:33 2010 -0800

    clean up tests and add overriden time method to utils

commit 43ee40310906a5a27f4098266881ce490a7ff874
Merge: 75185be 0f32417
Author: termie <code@term.ie>
Date:   Wed Dec 15 11:02:33 2010 -0800

    merged from upstream

commit 75185becad967389aff9aa465e9cce4356b6b7af
Author: termie <code@term.ie>
Date:   Wed Dec 15 10:38:30 2010 -0800

    add missing import

commit 81469689c5a4b967f47c4793c3ab8290d42e7c23
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.

commit 8f88dae7ac93c0017fa6a716039ff805026b78c7
Merge: c7e4ac0 49318c5
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 6f6a1c500697f57cdc43d8423a628de52dafb6dd
Merge: de25bb7 1e4cd9b
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 9e7ea01fd6129c04b7318b594f700d23643a4ed5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 17:58:55 2010 +0000

    I made pep8 happy

commit 1e4cd9b5f88156fa7e1a6e572aa15476bc1dc016
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

commit eb52fcf5d74658ec3479250d9f6328a1b4a715d7
Author: root <vishvananda@gmail.com>
Date:   Wed Dec 15 09:38:38 2010 -0800

    clean up code to use timeout instead of two keys

commit e358e813bbae6f0ac3315649c2fdfd59f6169870
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 17:35:56 2010 +0000

    final cleanup

commit f651733866263a30e29b37a293565e05575c95f2
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Wed Dec 15 20:17:44 2010 +0300

    Restore alphabetical order in Authors file

 Authors |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e1b6dfc141580b28bb1d37b80674147f785d15cc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Dec 15 14:27:07 2010 +0000

    removed temporary comment lines

commit 06a6d86762290a2e904aa27ace2327b02d6f6e48
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 14:04:06 2010 +0100

    Lots of PEP-8 work.

commit 11180be0fecd70d64c7aeaa73c69fa0ebe9a37a1
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

commit 761138b2a11026476eb4df3e79b46aecf8abe134
Merge: 6e22446 0f32417
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 13:23:33 2010 +0100

    Merge trunk

commit 8bce8dcdfc40580d9b253e17f9da18479fac7929
Merge: 1a27716 de25bb7
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 cf7dbe07b2038309b1d664bd176d7638a2c9594d
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 files changed, 1 insertions(+), 1 deletions(-)

commit 53670ec8065e7b9b905932950f57215eba37b197
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.

commit b6afc0b566cd05e69fa1eb91ed6a40abbb214996
Merge: c9815a3 0f32417
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Dec 15 11:54:00 2010 +0100

    Merge trunk

commit 0f3241771090f7cb6c95c9864ec3052bdaf8a529
Merge: 4a91866 79dc9e9
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 95666ad6f0cc29669a109c73091ac0ef299e5f0a
Merge: 26ea527 d7c2103
Author: termie <code@term.ie>
Date:   Tue Dec 14 17:06:56 2010 -0800

    merged upstream

commit 306c0341c932ae89fbca1ffb2baab788045a1cd6
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Dec 14 16:48:44 2010 -0800

    remove some logging

commit efb26f52e1ac49fc8aa57d9f11e223c4e1bb5261
Merge: 4313d55 d7c2103
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 f129b855260bdc1d9f4853eba15ccc5691d65ee9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 15 00:25:04 2010 +0000

    Lockout middleware for ec2 api

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 26ea52753083d3aa3e9d7d046e93223b57133b7b
Author: termie <code@term.ie>
Date:   Tue Dec 14 16:05:39 2010 -0800

    updates per review

 run_tests.py |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

commit 4a91866d07dc3d03ed9961ea91059092ff32d2cc
Merge: d7c2103 5d853ec
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 5d853eced2436bb672f7416265f4ebac32c4d239
Author: jaypipes@gmail.com <>
Date:   Tue Dec 14 18:22:03 2010 -0500

    For some reason, I forgot to commit the other endpoints...

commit c72124e840da4ab3b743619bbb75577be6c52a68
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.

commit 52cbd004eb29a52885e0dd56665a9a9d751c73d8
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.

commit c7e4ac0081ab494718c3125a06d6c0103fba2b69
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 17:56:42 2010 -0400

    pep8

commit d7c2103d88fd573e2405d06e9f020ed6eba596c0
Merge: 4f92976 e0cd2c3
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 f6b540e10cc120f8c6fe6d7eb0579bcc9bda4adb
Merge: d25dc51 b579e6e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:25:02 2010 +0000

    nothing

commit d25dc513fcfec93f6f99cd5417848f44ab79564b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:16:58 2010 +0000

    nothing

commit 0f2e0ea9c7b9ea6491bf65a21ff83ae4e68063bf
Merge: 1eb5b1e 4f92976
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 14 18:11:30 2010 +0100

    Merge trunk

commit 8f8d40dd866038c4b3a36726d4451a1b25e3bc01
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 17:02:43 2010 +0000

    nothing

commit 341731b0949d7f26bcc38e5651ca6ea3cc728046
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 14 16:32:28 2010 +0000

    support for pv guests (in progress)

commit de25bb7ba2b427b93a8db10ca707097789cc77f2
Merge: 5554064 4f92976
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 14 15:34:17 2010 +0000

    merge trunk

commit 1eb5b1e7ff6f6c3075093cb57acf751e1fec5843
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.

commit 1a27716d321aa30c42b2e30775c55809c9f385b2
Merge: 38fd3f4 5554064
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 28e8654a1ced0c76d429969c7a016c7729bd47a3
Author: Eldar Nugaev <reldan@oscloud.ru>
Date:   Tue Dec 14 14:54:50 2010 +0300

    Added my contacts to Authors file

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 555406452176e6237a72c9371370021e427fe09d
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

commit 4f81ddd1cf0c499e90fc288c5e048ed1dc573ea3
Merge: 5e9b636 4f92976
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 04:25:39 2010 -0400

    fixup after merge with trunk

commit 5e9b636fa6142d7efd1061504ec71e242d5a52ab
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 02:43:15 2010 -0400

    added callback param to fake_conn

commit 3a2501f5dcfd65ecc821c02ac730056ccdbe0909
Merge: 54d0f51 7e18be7
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Dec 14 00:10:30 2010 -0400

    added not implemented stubs for libvirt

commit 54d0f51773e687a2bf3c57063809cc5c0fd0bd70
Merge: 0382e96 cd74757
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Dec 13 23:34:48 2010 -0400

    merge with trey tests

commit 7e18be7403c5a613181ccb28af4389d3bb4fbb85
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Dec 13 18:25:17 2010 -0800

    Fixed power state update with Twisted callback

commit e0cd2c35084974a5e8e19f8a53a7d434d8df8da9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Dec 14 00:20:27 2010 +0000

    simplified version using original logic

commit e356827ee7de917749fa56db1485f49ce0cb24b5
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 13 20:31:33 2010 +0000

    moving xenapi unittests changes into another branch

commit 4f92976e6e9187d24d828cb2786e945f1524686d
Merge: bcf3353 64d60f2
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 bcf33537303c031bf76c50a884542718013aa180
Merge: 6f838cd da0535b
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 6f838cd70bd352e054fc4ff8472d37b5b3b03ea1
Merge: cb5a588 3dea978
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Mon Dec 13 19:34:09 2010 +0000

    Fix exception throwing with wrong instance type.

commit 3dea978e8813496c6c5819170789f2032cfebe17
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Mon Dec 13 18:56:07 2010 +0000

    Add myself.

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 38fd3f4939fef99a40660f95050c2ab362373b6d
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

commit 044aefedfa032fcc28806728aa0d9d19986a08b9
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 13 18:22:56 2010 +0000

    second round for unit testing framework

commit dbe8267486dc2414ba2b3985d8d8bd71c8d1b34c
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 files changed, 1 insertions(+), 0 deletions(-)

commit b579e6e8d29b9dc973da6413fdbf17811f16b9db
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 +
 7 files changed, 57 insertions(+), 0 deletions(-)

commit 6e224468c28b6363fa84df321741e9643deb993f
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.

commit e0e033b4be8e060dd5247447c02525a6f958e4b8
Merge: 5562ffa cb5a588
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 13 14:12:02 2010 +0100

    Merge trunk

commit cb5a588ef3bfc20e09ef078a65a0bdb7ecfe9d12
Merge: 3ecd510 e013049
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 3ecd5107025d205e8771167cc675936582be874d
Merge: 2b97f56 7a1e369
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 5562ffa40b49598947a155869d791a9d81f97b61
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 13 09:49:13 2010 +0100

    Elaborate a bit on ipsets comment.

commit 5ecf9dd335e376db009e10551717bdda5c873de2
Author: jaypipes@gmail.com <>
Date:   Sat Dec 11 15:42:05 2010 -0500

    Final round of marking translation strings

commit 3b4d957c5ce2f00f429053c45748929d64fcc671
Author: jaypipes@gmail.com <>
Date:   Sat Dec 11 15:23:40 2010 -0500

    First round of i18n-ifying strings in Nova

commit 435568e338dcf2e31f247022328ef781c2a4b654
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.

 run_tests.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit da0535b63c4e5945982cffa220a2c4c4f9867ec8
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Dec 10 16:03:30 2010 -0600

    Fixed spelling errors in index.rst

commit a944fe6f24c11f4cb9a1953751035f0b0eb440dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Dec 10 21:15:33 2010 +0000

    fix pep8

commit e1f2701485a4c3a3ce7c90e0722a03d5b74a986f
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

commit bc6ae9625307e17e9d0a86a24ef50f9261eac7ca
Author: Andy Smith <code@term.ie>
Date:   Fri Dec 10 11:53:17 2010 -0800

    port new patches

commit 39fdbf978a195ee2057050179ef018415c7364b0
Merge: bcae7f7 2b97f56
Author: Andy Smith <code@term.ie>
Date:   Fri Dec 10 11:46:29 2010 -0800

    merge-a-tat-tat upstream to this branch

commit 351c82e8c72988fecb9894acdaa84ab8ffa032c2
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Dec 10 18:49:54 2010 +0000

    Format fixes and modification of Vish's email address.

commit b6e108905fc9d27da1a25efd93bf9ea766c350ea
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!

commit 56e1c637ead0bdb0cb9650b8fcf195614e929450
Merge: 871019b 2b97f56
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 cd74757a78fce424f7e3a13c70d444d7458187ad
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 17:55:21 2010 +0000

    added pause and unpause to fake connection

commit 4d49cd65f8bf8a91a7ce4fcce504f52f2ce72437
Merge: d396728 0382e96
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 16:45:26 2010 +0000

    merged changes from sandy's branch

commit d396728a0330b877657a838507fa78699f8e51e9
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Fri Dec 10 16:28:23 2010 +0000

    added unittest for pause

commit bcae7f73f8173db9536ed339048f2c42105d238f
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:45:51 2010 -0800

    add back utils.default_flagflie

commit 249287718d755d85af243b78c7d09a9d35f9f6d7
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:18:52 2010 -0800

    removed a few more references to twisted

commit 39bb04c968462e06b0005e8fb397efd7d8539cef
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 16:05:13 2010 -0800

    formatting and naming cleanup

 run_tests.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit f152af5f05b2697de405c4d9c73207083fe381e3
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 15:25:14 2010 -0800

    remove service and rename service_eventlet to service

commit d001a8d133accf6cef780e11da838d55f8d40225
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 15:19:56 2010 -0800

    get service unittests runnning again

 run_tests.py |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

commit 48e0d4ab9108598eff9a1286cf3bd699a9f812e0
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 14:37:43 2010 -0800

    whitespace fix

commit c83d62537aa83be4206c91180f94a9e15871b6eb
Author: Andy Smith <code@term.ie>
Date:   Thu Dec 9 14:36:23 2010 -0800

    make nova binaries use eventlet

commit 74d1df713ed07df66b4e04c706002cd416596d9e
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.

commit 0382e96ddc1fad56b143445740ff42034e3790d9
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 17:32:27 2010 -0400

    remove debug messages

commit c33b181bd576a7c3cc4073a168135c634a8014db
Merge: 21dffbe 0407db6
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Thu Dec 9 17:13:53 2010 -0400

    merge with trey

commit 21dffbe3456a62f2390685cab45919e8683676be
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.

commit 7b6cebb053eac2acee03118389338ccba66ff1b4
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.

commit 2b97f56153596c78e213bcdcfbaeae71b60662d3
Merge: e341a0d 7630e45
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 7630e4537c5952da6afa6a415322d57c33cf7213
Merge: 0156196 e341a0d
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 13:38:57 2010 -0600

    Merged trunk

commit 01561964114fa55c199fe8fb43146ff52c76fff7
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 13:37:30 2010 -0600

    Added exception handling to get_rrd()

commit 7a1e3694f1b2c82f4fae39f83b1d7b2c35cedf69
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.

commit 0407db694d59cd4ffde833dfc261ad738d601913
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 17:54:30 2010 +0000

    changed resume to unpause

commit 82d5d590906f3d4cc9335614361398e782a446ee
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 11:32:23 2010 -0600

    Import module instead of function

commit 64d60f2a789ee8f28b6cffcf8fcfde56f937624b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Dec 9 17:30:03 2010 +0000

    filter describe volumes by supplied ids.  Includes unittest.

commit 0622668c419e84ed3604912bcbd1e2ad192502d2
Merge: ec17029 5c21dd0
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 17:25:57 2010 +0000

    merging sandy's branch

commit 9941fce66483d97093fb93b0b033c015f66277fc
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 11:08:24 2010 -0600

    Make get_diagnostics async

commit ce280ca7f87cbf084855c60b7f4f7b06dc117c7f
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)

commit ec17029b4fd5e578401f3582a712df63a981ef09
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 16:41:35 2010 +0000

    pause from compute.manager <-> xenapi

commit 6bcbd57ce06c56f4021e7e8cba3e0351e063ea7f
Merge: 83bfe42 06e0238
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Dec 9 10:40:44 2010 -0600

    Merged Armando's XenAPI fix

commit 5c21dd0fe3dde7bb363e967e30668aca40a6df31
Merge: 686c9f9 e341a0d
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 e341a0d690de396bc79e58f8d4586ee79688c8e3
Merge: 7d0f931 78a8bcc
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 78a8bcc408deff2e5589ec26dc344436d36930e7
Merge: 4e9a515 7d0f931
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 5f491bd6dee400eb20f55d7223477cbaedc318dd
Author: Chmouel Boudjnah <chmouel@chmouel.com>
Date:   Thu Dec 9 13:43:54 2010 +0000

    fixes exception throwing with wrong instance type.

commit 91eb48800f32830a6a892be617650e2ac0c0611b
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.

commit 06e02383dcdf833a95cb61aeeb083af1bbf3e144
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 9 10:40:07 2010 +0000

    fixed how the XenAPI library is loaded

commit b45384cbd6837b3ed41ca789601dc95ea98e1107
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 17:25:57 2010 -0800

    remove some unused files

commit 999ee49523f873e1118ac6117341965ea0067916
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 17:21:43 2010 -0800

    port volume manager to eventlet also

commit 5164ab45f2b0adca8ac287efb6127fa253470c0e
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

 run_tests.py |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

commit 7d0f93114fe0f048b300dae391bd56c4af8d75ad
Merge: 5fe0b6e 5651d04
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Thu Dec 9 00:09:29 2010 +0000

    some pylint caught changes to compute

commit 5651d04ced290bb1e2638fa151130d15ddf44d08
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 23:47:25 2010 +0000

    added to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5fe0b6e4f533e96501ba8535c0678e49f9cd7497
Merge: b082bff 45e398c
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 92995b53a589a93419f69e5c0bffee0737da48fb
Merge: fb029d8 b082bff
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 21:36:26 2010 +0000

    merge conflict

commit bfb9b32e328b72de9ecd99933355649c25a67985
Merge: 671ae0a b082bff
Author: Andy Smith <code@term.ie>
Date:   Wed Dec 8 12:59:22 2010 -0800

    merged upstream changes

commit 45e398c4b8b62de848f18e13951b04f02e88f4d2
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 files changed, 1 insertions(+), 0 deletions(-)

commit 83bfe42056bb52c0f4e70e676bd1b73085e7d90c
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:16:49 2010 -0600

    Fixed docstrings

commit 39bffa7cb55d8a84073a9b0fb30476c3f21cc47a
Merge: e081229 b082bff
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:09:31 2010 -0600

    Merged trunk

commit e081229ce1124a9ab1338baeb2965326a968d3a5
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 14:05:50 2010 -0600

    Got get_diagnostics in working order

commit 686c9f9fe8a9d2d54e06787ec8f594fb9fd5f5d2
Merge: c53e54a b082bff
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Wed Dec 8 19:29:07 2010 +0000

    merged updates to trunk

commit 871019bc2397060086ce3171976d30f1155fd069
Merge: 6761694 b082bff
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 18:54:15 2010 +0000

    merge trunk

commit 67616941cc6875151d876b36d8798ba191af1a4f
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 18:49:28 2010 +0000

    typo fix

commit c395bce4d72b1ee5de3dedf5ef5a9f179a275041
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Dec 8 11:59:37 2010 -0600

    removing extraneous config ilnes

commit b082bff880d39b9cdddd257b92eefe1222fd7b7b
Merge: 9572f73 e9847bc
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 9572f73f6545d567154c8f605eb79edb5dab9929
Merge: 9090c31 4dda2db
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 131aa3b60f2723617d725db168f5eb6a6e225c1c
Merge: f9a61f6 9090c31
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Dec 8 11:22:12 2010 -0600

    Merged trunk

commit 9090c3167e3e0752f26a03cc3c5adb31a0eb7846
Merge: c53e54a bc80ea6
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 4e9905f7ed2a97c80dfd2a3a310f0db2cc372053
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 16:38:35 2010 +0000

    PEP8 fixes

commit 740e570c59e0a75d372caf81b3689b048652d2cc
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 16:26:12 2010 +0000

    Setting the default schema version to the new schema

commit 66c11911246f6c4b9ff52acd547f878b788f4654
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.

commit f594a685fad94acb5774b4fbbdd21f875129639e
Merge: 1ae0115 c53e54a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 8 13:50:37 2010 +0000

    merged with trunk. All clear!

commit 704732fd2586f13327e194211230a4e642a4269f
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.

commit aee0095ebb38bc405daffa0f30ef6ee20f007baa
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Wed Dec 8 17:23:51 2010 +0900

    test commit

 README.livemigration.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit fbf8b1bed0d53868f9b2940fd2b874752ed76009
Merge: ea4eda6 05fbd3b
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 08:21:44 2010 +0000

    Merge from trunk

commit 86055be166c9fb8486d31bc9dbf4e6da14e27711
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Wed Dec 8 17:21:04 2010 +0900

    コメントを除去
    README.live_migration.txtのレビュー結果を修正

 README.livemigration.txt |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

commit 05fbd3bd4f1d21ac2e05ffa8a5b920efce637a5e
Merge: 98a9052 5fe0b6e
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 07:38:19 2010 +0000

    Merge from trunk

commit 98a90527a290cee38a9b2632c8c0164745a604d5
Merge: 85515cc c53e54a
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:54:58 2010 +0000

    Merge from trunk

commit 85515cc759c4e38426317e136539aa777038f212
Merge: 2710eba 6b5caf4
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:52:20 2010 +0000

    Merge from trunk

commit c53e54aec1e5a1e12a9f8e8416f4e08c80b405c8
Merge: 6b5caf4 0633d1e
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 0633d1e867f15e4982c82001643b155b55c267ab
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:34:20 2010 +0000

    More pep8 fixes to remove deprecated functions

commit a9a45e76cdf0a0f8121d79dadbf244134e11f088
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:26:41 2010 +0000

    pep8 fix

commit c715bbbed74a58e82ac2ec01e8bbb37e2352d46f
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Dec 8 00:08:47 2010 +0000

    Clarifying previously commited exception message

commit a8d0901d83e262da67af6870c40f52c0d7fa9292
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

commit 4f0fa63ce30bec2d310cf848dc253fe88f709fed
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 23:46:18 2010 +0000

    Removing redundant check

commit ce30a35c9062bbe97ca24288fc3034ccdbc94af9
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Dec 7 16:48:42 2010 -0600

    Added livecd instructions plus fixed references to .conf files

commit 1ae0115d547f9db5749afd967554af1fd15feaa3
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 22:22:48 2010 +0000

    pylint fixes

commit f9a61f639f9131b8237c89225f81d87f491eb7fb
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Dec 7 16:06:55 2010 -0600

    Initial diagnostics import -- needs testing and cleanup.

commit 6b5caf45e2e2d215953be6a81fcecc45c017360d
Merge: 0852d8d 31962a4
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 31962a4f92e7793fdf80c843048eba7ecc6ddbfb
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 21:13:54 2010 +0000

    Reverting last change

 Authors |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 2768b5e031769463a7db0f3dcaae992dec6d2001
Merge: a9ef144 371f9f5
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 21:06:23 2010 +0000

    a few more things ironed out

commit 0852d8d4bd630f185fc1dd2483e8e1ce77392c05
Merge: 28a1531 c9815a3
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 28a15317285a161b902054129f03c8cc0c70ce65
Merge: f77077c 0f2423b
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 0f2423b6375aa698ca3a46e24cf5a231c98553c5
Merge: 371f9f5 f77077c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 21:00:39 2010 +0000

    merge trunk

commit c9815a39122a4dfe342fe9cf5c92cf4e57d78801
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).

commit f77077c046ae6f30117e6c781e2c98b417852f10
Merge: 6cda237 7cc15ce
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 6cda2376b8d6e26814ccf21834a2382aa2c966b7
Merge: 0816dd6 8a85b1b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 19:49:15 2010 +0000

    Add Ryan Lucio to Authors.

commit 7f3d06c33284dc1c716a559ec4e7755b38352847
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Dec 7 19:35:05 2010 +0000

    Adding myself to the authors list

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 8a85b1bb1a768c244eb14d4710420c3d050b58d5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Dec 7 20:25:24 2010 +0100

    Add Ryan Lucio to Authors

 Authors |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 0816dd6f54d39f5be6fcb46dbca9b61b262b4261
Merge: deaca72 6e1c16d
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 371f9f59869cc6afaad4ec671c288aef85a1f8e8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 18:57:44 2010 +0000

    importing XenAPI module loaded late

commit e9847bcf0cb68cefc100bce30407be965834450d
Author: Eric Day <eday@oddments.org>
Date:   Tue Dec 7 10:06:49 2010 -0800

    Added docstring for get_instances.

commit a9ef1440e18fae62416a3fcc0fdb40b4f1896de8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 15:35:56 2010 +0000

    small fixes on Exception handling

commit 21fe170d92c62a9a9e92f6450241a56fd89e3065
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 7 14:36:49 2010 +0000

    first test commit

commit a19200e801956572c8810829fae554e7b1089fc1
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 14:26:38 2010 +0000

    and yet another pylint fix

commit e922983e1524672117c1eff34e5a6e00d6cf7d2e
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

commit 9296aac0650435c89942fb5c7b1c8f96667bfd5b
Merge: b117255 b94f0f0
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 b94f0f00d778aa85e239d33d6d49102a7a60bd40
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Dec 7 11:31:43 2010 +0000

    addressed review comments, complied with HACKING guidelines

commit d97be9f23fe71f00c65e32853c6d015109f9a270
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Tue Dec 7 19:38:19 2010 +0900

    adding README.livemigration.txt

 README.livemigration.txt |  136 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 136 insertions(+), 0 deletions(-)

commit e637459880d13fb3897527f966ddc9842ffc7824
Author: masumotok <masumotok@nttdata.co.jp>
Date:   Tue Dec 7 19:25:43 2010 +0900

    rev439ベースにライブマイグレーションの機能をマージ
    このバージョンはEBSなし、CPUフラグのチェックなし

 setup.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit fb029d8d6a19490a921ddee0b708631258bfb15e
Author: Trey Morris <trey.morris@rackspace.com>
Date:   Tue Dec 7 04:41:53 2010 +0000

    modified a few files

commit a67511a5fcca5cb7ed2051e7a4070944482abe44
Merge: e8b6818 4dda2db
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 6 13:29:52 2010 -0800

    Fixed conflicts with gundlach's fixes.

commit c40396a09d0e1c0700d57667999677ea453b84d6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 6 22:20:05 2010 +0100

    Remove dead test code.

commit 438bea211bd39c7cd274d0b8c10c700125192daa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Dec 6 22:19:29 2010 +0100

    Add iptables based security groups implementation.

commit 4dda2db7501c25f62dd8e8ddb224a76236c8fd37
Merge: 5ee12d7 0c70808
Author: Eric Day <eday@oddments.org>
Date:   Mon Dec 6 12:56:53 2010 -0800

    Merged gundlach's fixes.

commit 0c7080845f4e39395dac77998c99381a81943ad2
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.

commit c5a91d5d8f10b53dd569243b0d3160daa6d71583
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 19:46:42 2010 +0000

    fixed import module in __init__.py

commit b11725540f6ab055ad1ef7b8e5618e41233372fd
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 19:29:00 2010 +0000

    minor changes to docstrings

commit 3ad5c9a3f269d416c516c3a89a5624d912b14a30
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

commit 7289f7af37b9eba496e6c6fa511d2d03d8cdaa47
Merge: 518a19f cde3845
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 cde3845cf866a0b23627145b9e1942f46f4da9fd
Merge: d142fed deaca72
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 16:15:04 2010 +0000

    merge trunk

commit d142fedfc93295a27dbf07fcda6d69ef09aa9c23
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

commit d319b1166b94eead96f5c6b301c290652f7a99c0
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Dec 6 12:42:34 2010 +0000

    pylint and pep8 fixes

commit 6e1c16d596e02172fd8699665ee1c331b4192282
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

commit e8b681830b0e9ac9540ea5e20efcbf8a283a170e
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.

commit 5ee12d7a8bbf648f0c11770eaf43b872b6cbaef2
Merge: e0c0418 bc80ea6
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 09:37:40 2010 -0800

    Merged reboot-rescue into network-manager.

commit bc80ea65910a5baa9447324b358a12a2486f1216
Merge: 842ac25 deaca72
Author: Eric Day <eday@oddments.org>
Date:   Fri Dec 3 09:37:36 2010 -0800

    Merged trunk.

commit deaca72769527a9cfd7ef0e9ef3bc79022debada
Merge: b3428a1 3f02fb6
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 b3428a1b78feb047d36599c7ac810036c08409da
Merge: 3b78cf5 09478b2
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 18c6ff4d36c737f00b242b6a77dd15515e4396f5
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

commit ea4eda60f48ff949687f73f6df9c1fc7ab9575aa
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.

commit e0c041864f117cae224473450bdadc6a339ed451
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.

commit 3b78cf538c288d9fea7aa8298e40842b56630a2e
Merge: aafbb60 ae8023a
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 ae8023a06289601d385d8f301c8ea82fe7d27ab2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 15:33:43 2010 -0600

    pep8

commit 050d16f3a5eceb2415f4b32cbc7d6b7548daa416
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 14:17:41 2010 -0600

    Use newfangled compute_api

commit 440179229359c4c012c76ca8a86a4aa878571ec2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Dec 2 14:14:31 2010 -0600

    Update tests to use proper id

commit 3f02fb6edaec5861509d23e60942064b99a05b7f
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Dec 2 13:48:39 2010 -0600

    Fixing single node install doc

commit 94662fc8eadb48d18d74a15abfd80442416d4c4a
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.

commit 8cd192ea4d65909fb007699f689e3eeefe41ef2b
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.

commit 09478b2899cf0ad5d24426e363c7d3337bfef3eb
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 10:53:32 2010 -0800

    Added test files to be ignored.

 .bzrignore |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

commit aafbb604997bd7691f191badb4858bdd279065f4
Merge: 81a9b74 b11e6f1
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 842ac25d5227860c44a7f36af924eec79f144c2f
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 10:21:43 2010 -0800

    Moved reboot/rescue methods into nova.compute.api.

commit b11e6f1eb5c944272ad821c192f3617c54223b5d
Merge: aedd636 81a9b74
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 09:34:52 2010 -0800

    Merged trunk and resolved conflicts. Again.

commit 81a9b743177aa801959c8084e81f2a775eec6278
Merge: 7a2b4d2 61c5f89
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 aedd636ef12e9978c235f13c3de629a6a5f6c64c
Merge: 8e55d26 7a2b4d2
Author: Eric Day <eday@oddments.org>
Date:   Thu Dec 2 08:47:25 2010 -0800

    Merged trunk and resolved conflicts.

commit 61c5f89ec34c7646a829433c74b42d258ec9caed
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.

commit 62f13b0a3c89efed856a84990dfc80524aefa139
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.

commit 7cc15ce542ce2aedb193a7344a9a9121eee77b60
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.

commit 518a19f191e4f0a46710f900afdcf0045396c912
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 14:09:23 2010 +0000

    minor refactoring after merge

commit 7e790db9bfa23e7c7d504cb5ceca971e7f5add37
Merge: 69c376c 16dfe93
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 13:27:36 2010 +0000

    merge lp:~armando-migliaccio/nova/refactoring

commit 16dfe937f5d79d43b040205ab4c722d63d0921a7
Merge: 003fd50 7a2b4d2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:56:47 2010 +0000

    merge trunk

commit 003fd50f174e19a82604c82971f73b86b557bb11
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:36:05 2010 +0000

    typo fix

commit cf0ff015fc02b009dff8081fc070709315cf450c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Dec 2 12:13:56 2010 +0000

    moved flags into xenapi/novadeps.py

commit fe5c51110965cd25007eb19e258a886069ec3a2c
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.

commit 79dc9e9e09a3594bc6e8c97494115cda86f34a84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Dec 1 22:43:46 2010 +0000

    fix nova.sh to reflect new location of ppa

commit 15e69035c515e9fead0f69feb56ef67ecadb84f2
Author: Rick Clark <rick@openstack.org>
Date:   Wed Dec 1 16:23:34 2010 -0600

    Changed null_kernel flag from aki-00000000 to nokernel

commit 7a2b4d2d908cefae2eb00aacc6a37fb6147a45cc
Merge: d1934dd 7be3569
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 7be3569d3cf71a0d60661212b7b1da5a877a5d69
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

commit 6e03ccc7e5655a7278702277e52266911e16634e
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.

commit aa29f247455f90436b271c4fc3de318567a67799
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.

commit d1934ddd35932ef90be7c5679448437bf8c420eb
Merge: a4e178f 0693489
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Dec 1 20:44:43 2010 +0000

    Adds in more documentation contributions from Citrix.

commit 03fb2665bdac43a9544e93415954d29c0444f4f8
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

commit a4e178fe53f7800c15c3110cab0360bbe671a2c3
Merge: f950cb8 be0932e
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 f950cb818cee6fd6a0d940ee27ca8b46c70368a2
Merge: 1ed823e 69cf47c
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 1ed823ef34fa746f8812d7eb5856d6f7b6db3fd5
Merge: cd82e1c 2f8a6f8
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 2f8a6f80454fbb380d604394bf297ccdbf6b9667
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Dec 1 11:43:20 2010 -0600

    Removed a blank line.

commit 8e55d263df4eddd74db1dd08c4f32a2316935c06
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.

commit 5658fe13c6c13b7bdbbcd35f0161f7fffd46ab37
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

commit 69c376c77265cb43a469eb5c9a244a0af0b347d6
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Dec 1 12:02:02 2010 +0000

    minor refactoring

commit be0932ef2f85dfcd6b104ea0cc2c3563280718be
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.

commit ca3b7d98e65ceb0f7bf9a7802a66b07c4ae04e80
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.

commit 47af4e56a90213d91300edd2ec2b5e8390379325
Merge: 3e9ae11 2710eba
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 22:34:25 2010 +0000

    Merge from trunk

commit 2710eba91f6da56d78f05de93c7d0f10c07ac7a4
Merge: 3e9ae11 cd82e1c
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Tue Nov 30 22:34:01 2010 +0000

    Merge from trunk

commit 90e7451d9188b90f0a079681e50d22e0ce7c95cd
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

commit cd82e1caa9cab03221fb3890d89d4e0fbc3605c4
Merge: da63dbd 4162364
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 21:04:54 2010 +0000

    Delete unused flag in nova.sh.

commit da63dbd6aa2527350cff9fcb89ec3bd80ad1f5e9
Merge: 7aaaeda 5902c55
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 41623640b78a12917fe29b4409a9d267447b0f0f
Merge: 60891e1 7aaaeda
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 14:56:40 2010 -0500

    Merge from trunk

commit 7aaaeda49d1d2d62ada885a9b9ad054f62035b63
Merge: 84aef3a 6e9132a
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 16c5f9a6f2b3b1182d33ba38735b5674afd6b8b8
Author: Rick Clark <rick@openstack.org>
Date:   Tue Nov 30 13:08:39 2010 -0600

    Cleaned up pep8 errors

commit 2184ec86cd1ebeee953e5a0c5213bf04547cbed0
Merge: 100825a 415edb2
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 30 19:08:06 2010 +0000

    brought latest changes from trunk

commit 100825a2ee47aec92002c0447f3808af6f9647c6
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

commit 6e9132a9982a87713afe0f193e6300d862fb649c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 13:52:46 2010 -0500

    Fix unit tests

commit 84aef3ac93bbe9f4057d570f55b4c6abd585ffc2
Merge: 415edb2 59e4d96
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 cc43c85ada939e0d991338205363bdeb0a1d977f
Merge: 415edb2 1ec386a
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 60891e17d7d844d16bae43f790b8d4f8c537170a
Merge: 551ee33 415edb2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 10:58:21 2010 -0500

    Merge from trizzunk

commit c87eebdc15ed2efd2c387e3c2a18e91deacad624
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 30 10:40:17 2010 -0500

    If only I weren't so lazy.

commit 59e4d969960ef4ee98af78cd48697dc08bc59e91
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 30 09:19:32 2010 +0100

    Rename imageSet variable to images.

commit 551ee33cc82f07c67b1c7b9e29d6d6d464d99850
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 29 17:38:51 2010 -0600

    remove FAKE_subdomain reference

commit b0565381795bbab3f9f5439e60e4b28b9922690f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Nov 29 17:26:05 2010 -0600

    Return the correct server_management_url

commit 415edb2e18b26f9721c4ba321abfd8a0312e5498
Merge: 862c995 1577c92
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 6c49d15dbecd5b97b588bbd5e476cf2c8120a499
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.

commit 1577c9294a0ae0c79a2c129fca2771aecee2d8fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 29 21:23:21 2010 +0000

    update of nova.sh because default flagfile moved

commit 725e1f1dbb407a55101df3a7c0f920434d5b9bb7
Merge: e032ab7 862c995
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Nov 29 21:19:31 2010 +0000

    merged trunk

commit 862c9953b15c494a5ecab1d67ca2c6e64c029ac0
Merge: af88b28 5d57058
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 5d57058883cc106e8ad9f8e549ddc5b428c2890f
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.

commit ecc8c24bebaf0412108c633e062216b8908bbe09
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.

commit 9626074c0ee60c075daa1d46f792945242522673
Merge: 1c4ef7a fc7fded
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 1c4ef7abe7a36c5300f8bc0f3a9fe33de68a031b
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 17:26:44 2010 +0000

    changes

commit fc7fded3685e0055d63b26d1e61b3dc1252afb22
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 16:31:31 2010 +0000

    pep8 fixes and further round of refactoring

commit af88b28807d0064faeaba49f8b0c8f69eae30158
Merge: 48ab549 4ec7ec9
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 eb39982394f8169f94dcc1536eb688ce1f59b4f6
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.

commit 69cf47c7c022ee1543d2a1445c38d98d599afe2d
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 files changed, 1 insertions(+), 0 deletions(-)

commit dc55b1e19c0196f68fdf3052b088be8beac82a5c
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 29 12:52:03 2010 +0000

    fixed deps

commit 7332c54a47a404d7d9f31652e5ec423b95444204
Merge: 5a215be 48ab549
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 29 13:14:26 2010 +0100

    Merge trunk.

commit 0a8090e6fc6ebbbec7dad93b284d2ce1925cc2c2
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

commit e142226846af92deec2d8036c2819ba9a274d799
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sun Nov 28 15:12:37 2010 +0000

    other round of refactoring

commit c90e2f074c46234f1f9200a92214e0ebd34c9a33
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sun Nov 28 01:49:28 2010 +0000

    further refactoring

commit b4c216fa046feccc2ad764903694b3ad8c900796
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Sat Nov 27 13:33:38 2010 +0000

    typos and pep8 fixes

commit d0618a811420155b208760a4a1282a80a74b9d29
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.

commit 3f339fd3512a7f973a416c8e14dd6a6c879ba9e2
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Nov 26 17:59:48 2010 +0000

    PEP fixes

commit bf534666bef16f31383cf123b0915970e1b6e26f
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Fri Nov 26 17:04:27 2010 +0000

    Adding support for modification only of user accounts.

commit 5902c5569dec88a071fa6e77abc9cfc3f2c1054c
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.

commit d98039a891571591c867d350c3aea380e8b5e01a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 20:42:22 2010 +0000

    added attach_volume implementation

commit 9c1dffa2bd4ba1f68d5ff6abf200cac600ca0518
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

commit 48ab5497523964846f99de5d3649e52dd95755a4
Merge: 1f73e25 9814d32
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 b699a4b2c09ecea862d0cc4dccc2c9b070d97e22
Merge: 9d4681c 1f73e25
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Thu Nov 25 10:46:58 2010 +0000

    small conflict resolution

commit 9d4681c561dcbdf81f926b7c8a25d2b047a2d55b
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

commit 67ae4d59bce6a0b1aea2ffcbe357dfd0519305e3
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.

commit 0ed8a6849332d0fec2430628b87d240ea435f424
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.

commit e3bca6bf6747c33f2c9d270aa4e8c85899a181e1
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

commit e7fac86a80d5a7c227fb94c830f9bd80c08cb8e6
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 22:10:21 2010 +0000

    Adding support for modification only of user accounts.

commit e032ab76ae679c89bba791dd65ac2be83d35b9d3
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

commit 1f73e25a5189b4c4531d78dff7bdb67f205f0bcb
Merge: ba35b0e 7bce8b5
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 e26331d391d2de7a406024ae8e539601781260a9
Merge: 1eaae89 3e9ae11
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 15:46:32 2010 +0000

    Merge from trunk

commit 3e9ae119a0395f79a5672c0e23713a2ef9aca197
Merge: 44a18b7 ba35b0e
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Wed Nov 24 15:46:22 2010 +0000

    Merge from main branch

commit ba35b0e35a11f9d740a9604d2c975411c93955e5
Merge: 776667b f89750f
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 14:39:21 2010 +0000

    Fix typo "nova.util" -> "nova.utils".

commit f89750f2584dcbaca93b69a8159bb15ba1cb0ef0
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 files changed, 1 insertions(+), 1 deletions(-)

commit 776667ba7a975379b46d45f06c52aebaca7e11d0
Merge: c263f9c 146954b
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 c263f9c6cf7324804947b870f44e4817a02bae97
Merge: 804d2f5 040b2de
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 040b2de668e16294c2f9c0e9e37b48c1bdeecfb9
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.

commit 92f64fb4dcef9fb97621620931d40cdccb4f0b00
Merge: 69a6ddb 804d2f5
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Nov 24 10:08:57 2010 +0100

    Merged trunk.

commit 9814d32fe595795e412b64a3bf17f8d868b68918
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 24 00:16:47 2010 +0000

    pep8

commit 8e7b25abc207b605fd122cc3bd8d3225bce98709
Merge: 57e9ca5 804d2f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:58:26 2010 +0000

    merged trunk, added recent nova.sh

commit 57e9ca538cbbd742ae86edd5a619a5dacf116ae7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:56:26 2010 +0000

    fix typos in docstring

commit d76ce71c9a640f8dfce7949ed4a83d11f72f305e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 23:18:02 2010 +0000

    docstrings, more flags, breakout of metadata forwarding

commit 804d2f53e7238e19d6855d5b46a85af62a173de7
Merge: 69a6ddb e594a84
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 e594a84757ccdd053d0c2d32d03bee85cfd8ab2d
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 23:02:57 2010 +0100

    Add doc/build dir back to bzr.

commit 69a6ddbea58f83bb911cfa24ab9d6ac7796a5ed4
Merge: 5fb6b17 42a821c
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 ef3aa6aac39c6fe9034c44c087a4bcc6d709d653
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 21:48:32 2010 +0000

    add vpn ping and optimize vpn list

commit 146954b8b8f360ade6e0e1e5e503977eabd3fcd3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 22:34:53 2010 +0100

    Add an alias for Armando.

 .mailmap |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit f30a34ee382ca0076c067e7750eebe6a49e95241
Merge: 9e68e3e b57be3b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 22:33:22 2010 +0100

    Merge trunk

commit c7a61dc8bde407f0dae2aef7722b56697dc24f28
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

commit 5fb6b17440f26b2b201b8b3f37b07d6d62082802
Merge: b57be3b d291ce3
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 b57be3bc1fa230dfe58d6253f6e84397c525fca5
Merge: 23d9370 c952f2c
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 9e68e3e13b08e7c9c2643bbc877cb4a73fc47cb8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 21:58:46 2010 +0100

    Address pep8 complaints.

commit c952f2c06a040c1efe4c8b4e54edd95eac780a45
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Nov 23 21:52:00 2010 +0100

    Address PEP8 complaints.

commit 23d9370c3819ad82c7b2ef29797b19f71be2a731
Merge: e33738d b7898dd
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 19:09:36 2010 +0000

    Remove FAKE_subdomain from docs.

commit d291ce3c1f631adae025b12467379a984c1d37d1
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Nov 23 12:58:08 2010 -0600

    Adding more polish

commit f10795a55d2794bb8937423efc0df4a4adc5f6da
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Nov 23 12:49:28 2010 -0600

    Adding developer howtos

commit b7898dd9e031908684cf3146812b264c80c11cf5
Author: Josh Kearney <josh@jk0.org>
Date:   Tue Nov 23 12:46:07 2010 -0600

    Remove FAKE_subdomain from docs

commit 42a821c0a12b75d34d4e7dfb831f3769a2104f71
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

commit c80638973c0efd89d777db522dd14a5a75b5f74e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:57:25 2010 +0000

    updated nova.sh

commit 10f4f35badeb91b181a68a5bbc05f0e94c3c8781
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:57:12 2010 +0000

    added flat_interface for flat_dhcp binding

commit 442571623863d085c567fe606021413432d81b5e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 23 17:56:43 2010 +0000

    changed bridge_dev to vlan_interface

commit e33738d789a34c0226528a8a968767bdb87368ab
Merge: 69a4e83 eea21b8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Tue Nov 23 15:14:38 2010 +0000

commit 22675e79e66a408270d23f180b95b7b725acef2c
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.

commit eea21b8a551ccfb4a3cab6dba4b86c27beb9f538
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)

commit 7bce8b5d5ab9e5f33ff234406806ed236ef084bc
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.

commit 69a4e831ca4951b29561304c17f9043c2547bae8
Merge: a9e28c8 65c1b23
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 0693489518dafae4dc0f9cf49ec258e2dd9bbf7e
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 22 17:03:54 2010 -0600

    Incorporating security groups info

commit 4ec7ec9ec59de57fa0959dc4d0a90fb41103670d
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.

commit 65c1b2398dd65ce7abda2528f3048651283dd78b
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:48:44 2010 -0600

    Use FLAGS instead of constants

commit f4fb48f3dfc838c0649d3dbac7dcd7b53be27468
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 22 16:43:17 2010 -0600

    Incorporating more networking info

commit 31cc81556d016492f60516d20a782da7ed2851d7
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:28:28 2010 -0600

    Make time.sleep() non-blocking

commit eb0a451a12fdc3f358fbd5b272d23d1b589216b3
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 16:04:21 2010 -0600

    Removed unnecessary continue

commit f1e13853da7a2d2f05341b0d6ebeaa012bde4726
Merge: 2824314 9d074e2
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 2824314937cefde4517febd3efa0b7e8b97d2b35
Merge: c9ef8a0 0a97735
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Nov 22 22:27:15 2010 +0100

    Merge with trunk.

commit 6e60ee719ec85132447bd63ad34950683cc4502f
Author: Josh Kearney <josh@jk0.org>
Date:   Mon Nov 22 15:22:02 2010 -0600

    Refactor AMQP retry loop

commit a9e28c88dbdaedb7865056df7d9d9ff3db1c5c09
Merge: bc0c7a3 dedda1d
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 bc0c7a32de37d1bdb2bc6392866ee963efc97e57
Merge: 5bee76d c13374b
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 5bee76ded1e3425ad586fe6e88b24cd204573bea
Merge: 0a97735 2633fa1
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 20:49:28 2010 +0000

    fixed pep8 violations

commit 1e9365c6bfd2169e176d24b161c36c7ca80518fd
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

commit 2633fa1c1117bd252ba982ca16db5b7e7b8a03a4
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 13:11:00 2010 +0000

    pep8 violations fix

commit a2210b52b4fcdcdbce2612045a8fab7736477307
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 12:57:03 2010 +0000

    added placeholders

commit e8449be04b1dc64eac6e53b72c776469e4f68bca
Merge: 4539fd0 0a97735
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Mon Nov 22 12:15:11 2010 +0000

    added test for invalid handles

commit c13374bb161bb8730ec2f8504b021b1ce2b6a79b
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 files changed, 1 insertions(+), 3 deletions(-)

commit 0a97735272ccc304154e2b841576a6e76d59cdae
Merge: ae40a86 a78e269
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Nov 20 21:04:35 2010 +0000

    Check for running AMQP instances.

commit a78e2693035cd3e4edbb145b47365c3a7ed227e7
Author: Josh Kearney <josh@jk0.org>
Date:   Sat Nov 20 12:16:54 2010 -0600

    Use logging.exception instead

commit 51efba33339cc5d6c6568193633ff8795daf4151
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:42:37 2010 -0600

    Reverted some changes

commit a8230b1d26856b1bb62f2c0f463d002dc98846c8
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:13:04 2010 -0600

    Added some comments

commit ae40a862f8b42ad905e15ca90cfec59cfd6a2a4c
Merge: 4b5c61c 8514c2c
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 6c08db5e1f71d3333b09e3c7fc9cefebaeeb1ade
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 16:01:55 2010 -0600

    Added some comments

commit 2abf7a45a0bea29352244b644295c78a559b5a68
Author: Josh Kearney <josh@jk0.org>
Date:   Fri Nov 19 15:47:24 2010 -0600

    Check for running AMQP instances

commit 4539fd0b17915a92ea6f9b9f88830352130bcf56
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Nov 19 17:32:38 2010 +0000

    first cut of fixes for bug  #676128

commit 8514c2c6093f7faf14759bd26f2bfdf932dde807
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
 1 files changed, 0 insertions(+), 0 deletions(-)

commit 4b5c61c4afb5b024e5f0cb2b8912fe7f3f11a875
Merge: 0ec9c04 a1f6b76
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 a1f6b76ce6bd4ea3a56ed5f325c9eff0552ea6c0
Author: Eric Day <eday@oddments.org>
Date:   Thu Nov 18 21:27:00 2010 -0800

    PEP8 fixes, 2 lines were too long.

commit 20d9a5931a73eb516b843257f2b3ed262ba6a999
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.

commit 0ec9c049df17e5b19787c8442be362c4a55fdb85
Merge: 1ab0abc 51d7950
Author: Josh Kearney <josh@jk0.org>
Date:   Thu Nov 18 20:04:38 2010 +0000

    Improved Pylint Score

commit 1ab0abc87a7fad4d9847e35c3096c63b453be56a
Merge: b277399 12be14c
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 12be14c180d408c2de97af2f19a6a4f7218a3c78
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

commit 3c3b9fa1ec7e33cc60440084da361f5182e4ca85
Merge: 1def405 cbf5b41
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 cbf5b41555a4847927d8a391e980ee01939f8e71
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 files changed, 10 insertions(+), 1 deletions(-)

commit 7294e2e284250b6584716d6636be020e3ce92bd8
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

commit b2773990e95baffa743ba0affad75c66b3c483af
Merge: 400534e c29cca3
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 1def4059c7bc7feabde7f92831c4f61114282ae3
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 16:03:09 2010 -0600

    really adding images

 .DS_Store |  Bin 0 -> 6148 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

commit e3374e5b506d84433a8faabed73f41bbfb609024
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 16:02:11 2010 -0600

    adding images

commit a42d265acb397994196724678a0910d5a3fd10d8
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 15:58:10 2010 -0600

    Documenting all nova-manage commands

commit d269aab6257dfd74188de630a6537aa685e68693
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 15:54:19 2010 -0600

    Documenting all nova-manage commands

commit 400534e74d8e4c89b76d05ba17f1181293e4f73a
Merge: 8894969 e06d08a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 21:49:25 2010 +0000

    Fixes eventlet race condition in cloud tests.

commit e06d08a3137c36ff6d9380cfd7cf525f2dc20d72
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

commit 53cfe6131c5d2e13a1be87625cba7947e3d0abae
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Nov 17 14:28:09 2010 -0600

    Testing man page build through conf.py

commit 51d79502fdc7e12b5a4a261ae94e90f7f4b2dcdf
Author: Josh Kearney <josh@jk0.org>
Date:   Wed Nov 17 13:56:42 2010 -0600

    Improved Pylint Score

commit 73675e41294bfcadb93e138f193ebe2701a0e43a
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 19:17:51 2010 +0000

    adjusting images size and bulleted list

commit f6d0a65001dc652dc2c290e6ce9156da4c3b5d07
Merge: f6a1579 8894969
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 18:33:47 2010 +0000

    merged with trunk

commit f6a157918369665fe7d83aaac04eff3148ceabf1
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 16:20:50 2010 +0000

    small edit

commit c05700eb5dad41a87bf588b470bc018f73b2565e
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Wed Nov 17 13:20:55 2010 +0000

    Further editing and added images

commit c29cca36c31b88c59d483b7a3aff7fdcc86b609e
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.

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 8894969d052a21cd16cfbd5dae1ff52df90a0a45
Merge: ea263a1 628218b
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 628218b19da3097475ce2db5b80860cd3cd86d58
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 17 02:41:04 2010 +0000

    delete floating ips after tests

commit 04d71e8faa03b580ea4098721705950e88687b0c
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

commit 305d24afae3c0d286c1e6f46dd419c10f1c47f37
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

commit ea263a1748a89eb6e3de17917501217b43ceb78a
Merge: 5aea37e 2317542
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 dfe867e901dd178afb54f54dccaed3d3ab5d161e
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

commit 5aea37e7eb9ddfcea9dea9aee3bb24139f84c035
Merge: bc4911c 1b7eeb6
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 1b7eeb6ec7fb9d332b44fe5cdbd36c18f8dd7e52
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:49:18 2010 -0500

    pep8

commit 02e489110dec5670055b9b689b41c86741091975
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

commit a3c201f7a89618c4efe7d7871e73a8e2673f65b6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:32:16 2010 -0500

    Add docstrings to any methods I touch

commit d7d4246b9811b815c6306a04f52001e79117a911
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:26:59 2010 -0500

    pep8

commit ca03fe77f6a1bb9f00e95003f62b9d3585e55442
Merge: f01b03c bc4911c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Nov 16 13:23:12 2010 -0500

    Merge from trunk

commit 4e9a515ea19bf0f9685e95f2c8da80539ef74090
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Tue Nov 16 05:53:21 2010 -0400

    PEP8 fixes

commit cc7fdfb6943651e76b449713987f25f398ffe6e6
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 files changed, 1 insertions(+), 0 deletions(-)

commit ed12ad04f3fe4cc9e9c94db168a00ca4a9ffd986
Merge: e37742d ba35b0e
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 e37742d529fffe78e88837baf3fc35a0271f48a4
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.

commit bc4911c281a545032f39a1a2b442c9b1ef823535
Merge: 46d0506 36add3a
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 16 02:34:47 2010 +0000

    Lots of documentation and docstring updates.

commit 36add3a675ed06c391115f59c6040f6596d677cf
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.

commit c65cbb5ab507bca610ed454110c941cb60e29bc8
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 19:13:45 2010 -0500

    Change how wsgified doc wrapping happens to fix test.

commit a9fd00a038426e707573a285b5d7da251a76c741
Merge: ccfe4de 46d0506
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 15:10:57 2010 -0500

    merge to trunk

commit ccfe4dea37cf5d01a816611c40e72d4e00f6695a
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 15 14:43:50 2010 -0500

    pep8

commit 9d074e2b3745a8f27e6b80fc52c4f7786b6e89fd
Author: Anne Gentle <anne@openstack.org>
Date:   Mon Nov 15 13:15:48 2010 -0600

    Adding contributors and names

 Authors |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit 7f54c499739b620dceb53e3443cbca0dcf978c6f
Merge: 30b1324 e33738d
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Nov 15 01:26:34 2010 -0400

    merge with trunk

commit 30b13246128c175a0cad0b27e1fce16392822da2
Author: Sandy Walsh <sandy.walsh@rackspace.com>
Date:   Mon Nov 15 01:25:42 2010 -0400

    base commit

commit 46d05064937265f73c5bb1e4697760cdc5068af4
Merge: cff0d49 e630f71
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 e630f71fbb36f322d8d9331af5e9317eae386d64
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 files changed, 0 insertions(+), 1 deletions(-)

commit 0132ca855ad3575979b030c36af41fba62b331b5
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:53:44 2010 -0800

    add in bzr link

commit e9ecda0ed0836eb15a825f1d9fd6f7ea36ee365a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:49:48 2010 -0800

    adding a bit more networking documentation

commit aa71d66c52a5368b7c6b9c2e42056ec42979d593
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:43:54 2010 -0800

    remove tab

commit f7479a956c41074ff6a110afe5a64e7e9bc36271
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:38:27 2010 -0800

    fix title

commit afc35398d5ce5d989b080fb59e859ce9bd2a9fd1
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:37:24 2010 -0800

    tweak

commit 1524cbd3a0111e525c00c6d0fa8a25bde59fe249
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 12:36:14 2010 -0800

    Fix heading

commit 0112373366735d9b561bee9928ae4696679a2adf
Merge: 944c5f2 8c05ddd
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:51:21 2010 -0800

    merge in anne's changes

commit 944c5f2b917c380915957ab07bd1b135d8d5feab
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:45:55 2010 -0800

    tweak

commit 8c05ddd81449c96bfcadc0d24edab177609be359
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 12 13:42:07 2010 -0600

    Just a few more edits, misspellings and the like

commit 64d474fc7c96699ccd3dae480b5a7c78a55553ea
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:12:46 2010 -0800

    fix spacing to enable block

commit d5c9c5500cf2db3c559c2f1226aaea10ef42efd0
Merge: bd51d21 c372683
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 12 14:10:28 2010 -0500

    merge to remote

commit c372683bd0724866e480f92d8a60ec382090f54d
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:09:07 2010 -0800

    unify env syntax

commit bd51d21d77d1449bba9ce1fa2e47d6f2b9a3ecb1
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 12 14:07:46 2010 -0500

    Add sample puppet scripts.

commit 1f3ec0d224fafa88a207e35d27e2aace8b0e448f
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 11:00:25 2010 -0800

    fix install guide

commit 18b7879418aa13a7d8b3eaf776c1d27c8b6cc3c8
Author: Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Date:   Fri Nov 12 18:50:10 2010 +0000

    getting started

commit abb454e2047f781f3ccb921737adfdc0833f1cf0
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

commit 873659419f381096947e3757b99dcc95ec57b2c8
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 09:29:40 2010 -0800

    fix conf file from earlier merge

commit bb81ab225ae5de4a9259634704a70987613141f8
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

commit 6c096110c10b5f2363c51c0fb34608c2e01a6a6b
Merge: cd4723d 92212f4
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 cd4723d2d5da5cf8dda8e740a3749be2fa26992d
Merge: de4d237 2071f4b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 08:05:45 2010 -0800

    anne's changes to the networking documentation

commit 2071f4b39e3e1f6afaf0f9aeaafda50ebb6786f6
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Nov 12 09:52:56 2010 -0600

    Updated Networking doc

commit de4d23708b0560528763adf8148de3db03b83f26
Merge: 28cb025 fd4267a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 00:58:01 2010 -0800

    anne gentle's changes to community page

commit 28cb025403af43788af238d0f1df3b20d9435c00
Merge: a45bf9a 6b82905
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 12 00:56:08 2010 -0800

    merge in heckj's corrections  to multi-node install

commit c9ef8a08e59ff78f6ca6ea8ca5d93961714524da
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 +
 run_tests.py |    5 +++--
 setup.py     |   10 ++++++----
 4 files changed, 34 insertions(+), 6 deletions(-)

commit fd4267a6b39b2ec7249bf1729ec6d1917b54ccd3
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

commit 6b8290513cedbc258b83272b4954a203546d3c16
Merge: f52b7d8 a45bf9a
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:47:14 2010 -0600

    merging in changes from ~anso/nova/trunkdoc

commit f52b7d86a10de44054c438de83ad4284f6eada90
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:44:40 2010 -0600

    fixed another spacing typo causing poor rendering

commit 8ff68c46850f5a759572d2b3a68a54bfe14f4e7b
Author: Joe Heck <heckj@mac.com>
Date:   Thu Nov 11 16:40:53 2010 -0600

    fixed spacing typo causing poor rendering

commit a45bf9a902ecc0c13a7a2f221feb4bba07ccaa07
Merge: 6afd24b 46e793d
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:38:41 2010 -0800

    merge in anne's work

commit 6afd24bbbf78bb69d98dcedd09038c3bf671a618
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:36:25 2010 -0800

    add docs for ubuntu 4, 10, others

commit 46e793d70364b7808c7882959023bdf8923d68ca
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 11 16:32:24 2010 -0600

    Updated Cloud101 and admonition color

commit 013c1ca0b4b76e4e0cc13358e615bb216a2e068f
Merge: c8ac907 ddf69a7
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:19:06 2010 -0800

    merge heckj's multi install notes

commit c8ac907871d52fbae5013491a30106865c8cdecc
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 14:17:32 2010 -0800

    working on single node install

commit ddf69a7b0a3b9d37976bee916240161a53d08e0e
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

commit 92212f4a44091910dd28c38a965c0fc47290da56
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:35:06 2010 -0800

    Add Flat mode doc

commit c25d2f8b32ec07339533b71e82d3e2b4a779535f
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:34:58 2010 -0800

    Add Flat mode doc

commit 3202b9c9fb626b1d672239eb8a53ea1db802c3ed
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 13:34:45 2010 -0800

    Add Flat mode doc

commit e5c7b070905652d1577c235271996561eacb56fe
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 12:53:35 2010 -0800

    Add VLAN Mode doc

commit 19d27cc2f501a2e50175598c9fc8f3f9472b7585
Author: Dean Troyer <dtroyer@gmail.com>
Date:   Thu Nov 11 12:53:16 2010 -0800

    Add VLAN Mode doc

commit dcdaa45e67f3f86e9ba6e66d1986fa6b15dd63e9
Merge: a1c2529 a024d08
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:47:42 2010 -0800

    merge in anne's changes

commit a1c252930506a0193740f73fe74fd8701af0e9ec
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:43:32 2010 -0800

    home page tweaks

commit a024d0832fd7625e2698829f2894cd9d339f3c39
Author: Anne Gentle <anne@openstack.org>
Date:   Thu Nov 11 13:39:54 2010 -0600

    Updated CSS and community.rst file

commit 4714daed17c1a4d6d6db2bb83e03c4af502a9c94
Author: root <sleepsonthefloor@gmail.com>
Date:   Thu Nov 11 11:07:47 2010 -0800

    modifications and additions based on doc sprint

commit 663d8f85a828a92d3bc861a1f4662fd396de99d5
Author: root <sleepsonthefloor@gmail.com>
Date:   Tue Nov 9 10:11:36 2010 -0800

    incorporate some feedback from todd and anne

commit 7f9cc1422888882ae0855baa8a7b46251813ea8e
Merge: 4115648 084addc
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 8 20:38:21 2010 -0800

    merge in trunk

commit 4115648902169cf5f0f6bcaf862a3da79c993aac
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 8 18:40:21 2010 -0800

    working on novadoc structure

commit 084addcbdbdc6ba40c31c2338831adf7d23504ca
Author: root <vishvananda@gmail.com>
Date:   Mon Nov 8 18:39:51 2010 -0800

    add some info on authentication and keys

commit 2e0f2cfefcc3aab8a88441d0c60d5edafe1b3d76
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.

commit 1a28a74c41fda8cb2c61d2ca9968e453d8de0714
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.

commit c7a686eece3dd67cbd23f8fff0b623e33e6efdd3
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.

commit 864d8faa2e5f7077511c909fbe30db2c0d7a918d
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 15:14:58 2010 -0500

    Cleanups to doc process.

commit e90cc464e8aee8460b174e0ee3cf31958c7df958
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:58:02 2010 -0500

    quieter doc building (less warnings).

commit 47120f50da49db90aed89e10838ca9cef3068c5a
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:56:17 2010 -0500

    File moves from "merge" of termie's branch.

commit fcdc8ff86fe4ca1e6e65fe0a2e98089ca141d66f
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)

commit c3d6da2c9464503359a4e6329ee164afdb21a95c
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:46:17 2010 -0500

    back out stacked merge

commit 778bc8a4d573ec9306fa929bff6b03dc53d5466b
Merge: 6d355b8 e96c954
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Nov 7 14:22:26 2010 -0500

    Merge termie's autodoc system into trunkdoc.

commit e96c95492922946d7998cc7a5a646df80f8561b6
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

commit d3c5274e0d8d43ec81dfbf000cf889c9c24fd136
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 02:54:28 2010 +0900

    Normalization of Dev reference docs.

commit 9f097493f5917fa0397ad6ea38854ec968fa7a2a
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.

commit 9390ffd0f8a0b0cb94616b257515bb5cfda3c3b2
Author: Andy Smith <code@term.ie>
Date:   Mon Nov 8 00:27:55 2010 +0900

    Allow case-by-case overriding of autodocs.

commit f38a7eeb8768fa2049ce0bd748594ba650ecf627
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

commit cceb872c730931ceaf369bf55bda493c5cb6d31e
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.

commit 84081e14194f0860e8d212cffb0f8ba6fbac70fe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Nov 6 00:58:05 2010 +0000

    add dmz to flags and change a couple defaults

commit d80a75433ee1ed0fadb4f3acf73b6d278eabafd2
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 +
 5 files changed, 21 insertions(+), 11 deletions(-)

commit 6d355b86640fc39da85b3d1c0387936655705014
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 19:53:31 2010 -0400

    remove finished todo

commit 42b50f769952664f3aeab754d02bd35152f436f9
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 19:52:12 2010 -0400

    Fix docstrings for wsigfied methods.

commit a0e16b5f36839f0ac90a86d8137d0d1e2643b473
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:52:59 2010 -0700

    fix default twitter username

commit 30225be3983f01db983564dcbb53fda35a1fc08b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:36:19 2010 -0700

    shrink tweet text a bit

commit 83e0ddfe61fec31a11dec77da3e06725d9c861ec
Merge: 43a1c58 611dd31
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 18:33:49 2010 -0400

    Merge remote.

commit 43a1c58676cbfba1a017302413d2a29f56881878
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 18:31:26 2010 -0400

    Document nova.sh environment.

commit 611dd315cde71ce3293258ba2f39f2718126ad12
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 15:29:54 2010 -0700

    add twitter feed to the home page

commit 0d9734dfd4e9562d9c6975791e839de198d8a79b
Merge: c87b76a 7f22614
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 17:34:09 2010 -0400

    Merge to remote.

commit c87b76aff7f632987c411750684a1681fbcf9422
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 17:33:08 2010 -0400

    Community contact info.

commit 7f22614b79933bab55b953c658592d1d1752a2cb
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 13:44:22 2010 -0700

    small tweaks before context switch

commit a7fe8b54fe8a8b343e47efa23140003e54d383c4
Merge: 8f7cc35 9a73ba6
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 16:25:46 2010 -0400

    Merge to remote.

commit 9e4560cb95fab0d061c91dc9208549808340a6b4
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 13:25:40 2010 -0700

    use include to grab todd's quickstart

commit 9a73ba6f1311f0bbd2c6c3bcabd4096a09d6183c
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 12:49:42 2010 -0700

    add in custom todo, and custom css

commit 8f7cc35aa001557653b40cbd079b50317b74df76
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 15:11:04 2010 -0400

    Format TODO items for sphinx todo extension.

commit 825357dac2e9a86488ed2925b4aba0e8dda2ddac
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Nov 5 11:56:12 2010 -0700

    additions to home page

commit 0cd8d910ef09afb0f9c200cb616a9adc1b4a4187
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.

commit 23f8a0f01f299301b2aac60900246c18a2f3e2e8
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Nov 5 14:09:36 2010 -0400

    update types of services that may run on machines.

commit eecf0baadf191c9c9325fa398ac4548bdc01ac3e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 19:00:46 2010 -0400

    Change directory structure for great justice!

commit e013049acf4f7afba4d7aac2cb6b0e7f76d7a7b8
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

commit 4cb0ad1290dcc9d6adab7a15a49e3e2312048e5c
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 18:17:02 2010 -0400

    start adding info to multi-node admin guide.

commit 521e7ceab851e8fff31e60c94f5ae187c87f944a
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 17:49:13 2010 -0400

    document purpose of documentation.

commit e01e8f6356af2dfd4e443e6b2f91201753540a84
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 17:36:32 2010 -0400

    Getting Started Guide.

commit 53713e7e1a2d39e84f5a351f3980a3c70567ebc1
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

commit 87dd9da91af2d75190368876686ad98d3edd96e5
Merge: 64f19da cff0d49
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 14:20:15 2010 -0400

    merge trunk

commit 5a215bec617f92e11c0ae4dbe0ee32a48ded22cb
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.

commit 64f19daf62fcb789841753b6075b2d79539fa614
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 02:06:28 2010 -0400

    add missing file.

commit 27f4a2b120a2ac61750d6da476e6eb07154cf476
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 02:06:10 2010 -0400

    Cleanup nova-manage section.

commit 095bfcaacab7a0395332498d74081e5bbefc0167
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Nov 4 00:02:56 2010 -0400

    have "contents" look the same as other headings.

commit cff0d498622c334105948a39bf77ed8ff76c2ed7
Merge: 26f6479 b55010e
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 23:04:01 2010 +0000

    Enables the exclusive flag for DirectConsumer queues.

commit 26f647984d1d18eccaf6893e777aa141cdce061b
Merge: dd6830e 16a54a1
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 b55010e646e3e90152d57362bb9dd0dcdebcf5ba
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.

commit bb447fc0b6d2df70bae2bd21aeac146b41b97ff2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 15:06:00 2010 -0700

    pep8 whitespace and line length fixes

commit 16a54a13e429645fe780fc5aaac306f6b3d26deb
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

commit 671a15df53dc727dcc0561629bf029f4b1924122
Merge: 999c8a7 dd6830e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:38:14 2010 -0700

    merged trunk

commit 999c8a7f4ddd9bdd0f7c6de04412d5fa5351b56e
Merge: b640288 bbbc1fb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:05:09 2010 -0700

    merged source

commit b640288be453af4a26a384b30e45554683133d84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Nov 3 14:04:36 2010 -0700

    prettier theme

commit dedda1dbc78b38b728547b40ed22423649185a3a
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.

commit dd6830ed97c83c50670d0ea877edb1299c6d1681
Merge: a725faf b2ee881
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 87c3e1fbd3d0357abbfc87c4b911020d2f25c6af
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.

commit a725fafac70e35f8f6f32b4da72393494ab6fdbd
Merge: 3980d44 4adbbeb
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 bbbc1fbfda4f943c6f6ddd731d9401d3d1554a90
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Nov 3 14:30:13 2010 -0400

    Doc cleanups.

commit 3980d44b8e8805b2a43f98fd609f1ed6c01da94f
Merge: 6a03b3e a8149bd
Author: Eric Day <eday@oddments.org>
Date:   Wed Nov 3 18:24:16 2010 +0000

    Fix flags help display.

commit b2ee881956a27d6c1e64060fdf3cbd7e4a0872a3
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.

commit 6a03b3eb6d34835ebb093537fb165b0d20277b44
Merge: e9e6c1f b08c8d1
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 94a3743a99c2e8aba36440ed896cd7d0cf9e151e
Merge: 754f7b1 6dfc50f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:39:51 2010 -0700

    merged

commit 754f7b1b4b84a15af1cc0348884ba30b4389ef53
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:37:11 2010 -0700

    more descriptive title for cloudpipe

commit 38b8f638c08d0f7f95d7da3caf3645760b6db991
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 17:36:03 2010 -0700

    update of the architecture and fix some links

commit 6dfc50f29dec1642e446f4b7e6b383f74ecab87c
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 20:31:17 2010 -0400

    Fixes after trunk merge.

commit bf7810aa07a0095f414bfc055e21470312f8dc9f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 16:49:34 2010 -0700

    removed some old instructions and updated concepts

commit aa946162086cf76471ced3b47bffb6208a68e2fd
Merge: 40dc4af 773a33d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:23:06 2010 -0400

    merge

commit 773a33df391e8a5cc5fd6963b07c3989564b80d3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 15:16:41 2010 -0700

    Documentation on Services, Managers, and Drivers

commit 40dc4afd1b0b2ab96cc530f6065e7e327298366d
Merge: 3bef7d7 e9e6c1f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:09:52 2010 -0400

    Merge trunk.

commit 3bef7d784c67bd2c0e1ad7994d9d97debe8c4840
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Nov 2 18:05:47 2010 -0400

    Document final undocumented python modules.

commit cccf3e50bd55a3937817bebbb23802a74a7572d1
Merge: e426254 9cd4947
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 13:58:32 2010 -0700

    merged trunk

commit e426254f535c29ea58c3b631d8d660d9a064f6d3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Nov 2 13:57:50 2010 -0700

    cloudpipe docs

commit a8149bd781187ec3a866424b0a625f1e90e17546
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 13:51:09 2010 -0700

    Fixed --help display for non-twisted bin/* commands.

commit e9e6c1f52e69607807b98e773f8229f2d9422231
Merge: 9667110 266253e
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 266253e8de3745172c2a3942cdd1e0677e645583
Author: Eric Day <eday@oddments.org>
Date:   Tue Nov 2 12:02:42 2010 -0700

    Fixed tests to work with new default API argument.

commit d85cf98856c48221d83b143fb229f14d506d80a9
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.

commit 9cd4947a3f01dba2b67776bafe9a6feeb18820f4
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 23:32:56 2010 -0400

    More docs.

commit 9a553ab75f46e8cad47d3979e39e72505032360d
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 22:32:41 2010 -0400

    Language change for conformity.

commit 028457c3a7e6a07dccd6a4b8b704e0b4ad0293e1
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 21:47:16 2010 -0400

    Add ec2 api docs.

commit 5ba3f9b640c4e1281930dbbc5cc740a4e58fdba9
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 21:13:51 2010 -0400

    Exceptions docs.

commit 2fb25362744f0cc2dea56edc16142f82ff65e858
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 20:33:03 2010 -0400

    API endpoint documentation.

commit 3737ce714dc0d37ad87e928e152fcbaffb2da2a2
Author: root <sleepsonthefloor@gmail.com>
Date:   Mon Nov 1 16:25:56 2010 -0700

    basics to get proxied ajaxterm working with virsh

 tools/euca_additions/euca-get-ajax-console |   83 ++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

commit f192c2eaf10fc0b37b770280edaa6b9151514297
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

commit d67bd8f2192eca32bb51e4c2aac95635f4b136c2
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 16:13:18 2010 -0400

    Virt documentation.

commit 67ca676230467f042e5190a12f2a1590aab2c63f
Merge: 7910f83 9667110
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Nov 1 14:13:58 2010 -0400

    Merge trunk and apply some sphinx love.

commit 4adbbeb85d33c1c650fe3ddc478b3cddd88072d6
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

commit b08c8d1fc525aaf011d5b0b4a4ae44f1de1e4eca
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 30 19:58:15 2010 -0700

    don't check for vgroup in fake mode

commit ef322a7ce60d3a0c4a3ff9401ab0660fd1e7429a
Merge: 73208a7 e9e6c1f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 30 17:42:40 2010 -0700

    merged trunk, just in case

commit 7910f83ae960627938695ad9715cad6ea09b6c66
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Oct 30 20:05:31 2010 -0400

    Update compute/disk.py docs.

commit fa0f8762012fa7d6d9fb14367ff3c446b8bd0b56
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 16:19:57 2010 -0400

    Change volume TODO list.

commit f7b4f00cf8aaba4b056418c9796d036f180d0fc1
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 16:18:00 2010 -0400

    Volume documentation.

commit 3b080abf6ee7fcd1fdff4903ad54e65cdfb11452
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 15:40:58 2010 -0400

    Remove fakes duplication.

commit 49395d3bfff1da3562846ed6fc9e133a242a569b
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 15:30:39 2010 -0400

    Update database docs.

commit 9667110264cda72d73deaa576168425148a7b7b5
Merge: 68a77d3 bc367a0
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 bc367a0cedbf3bc515376a80cf407cb925eb9f73
Author: Anne Gentle <anne@openstack.org>
Date:   Fri Oct 29 12:27:30 2010 -0500

    Changes to conf.py

commit ac9f8bfbb5b9c4b79e25433e47ca34b4078805f9
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.

commit c39a1fcdf5ad641d9b3a97e8945a4eb28f5273a2
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 12:35:46 2010 -0400

    Update database page a bit.

commit 7bef149f65e283ca0e3f0b4f5a043a7ee7b1ceb5
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 12:16:49 2010 -0400

    Fakes cleanup (stop duplicate autodoc of FakeAOEDriver).

commit 15394dcc38f1793a886869efdbcaa228c377919d
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 11:58:57 2010 -0400

    Document Fakes

commit 225fa98cb867e084d6c1f43b88b68859990b90c4
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 29 11:23:49 2010 -0400

    Remove "nova Packages and Dependencies"

commit e31ad80c5f780f2a87bc55505387ab661fda7fc7
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:32:32 2010 -0400

    Finished TODO item

commit a67479a53031aa356d672b772abe2b2eb9551c5b
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:28:13 2010 -0400

    Pep-257

commit 6ad710a4bac3674944fabdbeb3904f6aa464e109
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 20:13:40 2010 -0400

    Pep-257 cleanups.

commit cdd425a861463e1144410ad26552dae781329591
Merge: d855f7a 9bbbda3
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 19:00:12 2010 -0400

    Merge from remote

commit d855f7a948806026b04743d1ce491ffb65d4fa79
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 18:59:25 2010 -0400

    Clean up todos and the like for docs.

commit 8230add1fa2bac526135f7256086526647b3be03
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.

commit 9bbbda3840c431ccce0624e2a2852bf210091993
Merge: 67fd3e2 0eb10b9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 14:28:32 2010 -0700

    merge trunkdoc

commit 67fd3e2e5e3b71f91bcd703e68fd64e09a7bb741
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 14:27:24 2010 -0700

    link binaries section to concepts

commit 0eb10b914c76261d2c30fad0e46e80329525e311
Merge: 22b6c81 93e7c28
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 22b6c81fda746b892ccc99af3b986b85bbe10ece
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 17:08:13 2010 -0400

    :func: links to python functions in the documentation.

commit 916be2463542a45fd332f7951d1c1dc83d6e0c93
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 15:10:15 2010 -0400

    Todo cleanups in docs.

commit 6c593dd4bc01ba31dc929c9e16969edd223efd48
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 14:39:25 2010 -0400

    cleanup todos

commit 93e7c28e86f96b85c47dcea5fa131f6ebc493fda
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 28 11:38:43 2010 -0700

    fix title levels

commit f1dceba9e5fb4da9fbbe0616ad1a611de8f65bd0
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

commit 1c8b77aa7c28561141d5b0832ba9d8ad6d79eee4
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 14:04:11 2010 -0400

    volume cleanups

commit a1b22405db95d49819cb5aa5037eca53bb0f398f
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 13:58:20 2010 -0400

    Remove objectstore, not referenced anywhere.

commit af4c421866f6356a3d35e8bc273bd98030567cb9
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 13:23:43 2010 -0400

    Clean up volumes / storage info.

commit 68a77d3130a029d7e71348370738097fd70d811f
Merge: 811e352 a87ab1c
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 3f7d1e935708117fc4ee78f4f471b14e0b8dce98
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:26:29 2010 -0400

    Another heading was too distracting, use <strong> instead.

commit d15a6a3ab4c081acbe59b3eeeecba81cc0834be1
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:26:17 2010 -0400

    Fix underlining -> heading in rst file.

commit ccaa5743981e9a3bdd75ae4a4f37b9208c91be59
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:25:39 2010 -0400

    Whitespace and docstring cleanups

commit c104e18cd9863749067dfd2bda2220156af7a2e2
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:14:50 2010 -0400

    Remove outdated endpoint documentation.

commit 2ff2868baf5caf82ae905a8dbf7a048127127e2e
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:10:08 2010 -0400

    Clean up indentation error by preformatting.

commit 1de784294901ba70041c9cc20898a2edd73f4ead
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:09:59 2010 -0400

    Add missing rst file.

commit 9809533f816e80e5179498ec8061723f8acd96b5
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 12:00:25 2010 -0400

    clean up the compute documentation a bit.

commit a87ab1c68ca09357949f306ecc742e283f78b34a
Author: jaypipes@gmail.com <>
Date:   Thu Oct 28 11:43:08 2010 -0400

    Remove unused updated_data variable

commit 1ba193b8501f0f09e5255cdc23ae98449fbc09ed
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Oct 28 10:39:51 2010 -0400

    Fix wiki link.

commit da783e026256329531c5a3bf417b742269b98bf1
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Oct 27 17:14:24 2010 -0700

    added nova-manage docs

commit 5c9b20f3937885f325ebc9ba1185fd12c910bf15
Merge: a19cdd4 2066282
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 27 16:37:40 2010 -0700

    merged and fixed conflicts

commit a19cdd4100f0040ccef07817fda0bd9b66404231
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 27 16:33:25 2010 -0700

    updates to auth, concepts, and network, fix of docstring

commit 20662827efc847275e378c179666f2c4ba154a2a
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 17:31:46 2010 -0400

    cleanup rrd doc generation.

commit 8b29b1480361614e71c09d549bba063717a8887f
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 15:52:06 2010 -0400

    Doc skeleton from collaborative etherpad hack session.

commit ec23a7c4d630442a223ca86061dfa03b538a40df
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 14:55:01 2010 -0400

    OK, let's try this one more time.

commit 50aacd043e270d8d04590e3beb525bc4d143ea66
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 13:49:27 2010 -0400

    Doc updates.

commit 73208a734842e8fc92bb03ec5d8682f80a574e6e
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

commit 2326f77c2624892c15038327ee288b4810bf4a1f
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 11:10:50 2010 -0400

    Style cleanups and review from Eric.

commit 419ab33e7371463263d96c3a9b46ca9dcc3d46e0
Merge: ec37de0 811e352
Author: jaypipes@gmail.com <>
Date:   Wed Oct 27 10:51:37 2010 -0400

    Merge trunk and resolve conflicts

commit 46f1b77ed40b23e70f7fdaa5ba6bc10ae532dba2
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Oct 27 00:05:42 2010 -0400

    New structure for documentation.

commit 811e352e4eb050db31da0d45767475f0072a3069
Merge: 8022119 3931adc
Author: Eric Day <eday@oddments.org>
Date:   Tue Oct 26 23:53:55 2010 +0000

    Fixes PEP8 violations from the last few merges.

commit 3931adc63075316deb4c12f3b91f142b6d67f840
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.

commit 80221192ccde81aa65e4b7dc4ea50afa0fdf4040
Merge: 48a5c66 fb31a05
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Oct 26 18:04:05 2010 +0000

    Adding Google Analytics code to nova.openstack.org.

commit 48a5c66cab6b6133b709a6ded3cd130c31347d86
Merge: 43ba01c c51c31f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 26 16:49:10 2010 +0000

    Fixes service unit tests after tornado excision.

commit fb31a05439bb4506fada56aec6d0366361f202bf
Author: Anne Gentle <anne@openstack.org>
Date:   Tue Oct 26 09:06:37 2010 -0500

    Added Google Analytics code

commit 12282c87655b3d5a1f6346759b55d7c8df5f0afc
Merge: e9da0c9 43ba01c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:37:51 2010 -0700

    renamed target_id to iscsi_target

commit c51c31fcbe422ad178d2ba309325a3f91f15acb5
Merge: 76d02c8 b1c967c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:08:57 2010 -0700

    merged gundlach's excision

commit b1c967cf9f24b62c5e0426717ed59cc11b50fa39
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 files changed, 16 insertions(+), 0 deletions(-)

commit 1facd11e0603d40c37aa6f553ca4ce64a1cec2d9
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.

 run_tests.py |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

commit 76d02c8a4123cadc109bed0ed17ec423af8578a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 23:04:49 2010 -0700

    fix completely broken ServiceTestCase

commit 43ba01c49e6f9dab587e56af0fe8f2351ed2455f
Merge: 9b6ecfd c73b913
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 9b6ecfd47b6225a68b0bba56647e0cbd70265c58
Merge: 44a18b7 3b3c0f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 26 00:44:23 2010 +0000

    Adds rescue and unrescue commands.

commit c73b91394f2ab5ebdb102c51a0479ad419e6831f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 17:20:10 2010 -0700

    actually remove the conditional

commit c831adce44cdf126624171c7a1b2cfddcd87a240
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

commit f01b03c0fbbf521817e5017ba4760b45bb04b835
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Oct 25 23:10:51 2010 +0000

    Making net injection create /etc/network if non-existant

commit 1eaae890f0b341675a1016fb28c80d3048958065
Author: Ryan Lane <rlane@wikimedia.org>
Date:   Mon Oct 25 22:50:32 2010 +0000

    Documentation was missing; added

commit 406f10b7aead4c213373cf482675564718c6f260
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

commit 44a18b7c454deb66b99fb8c5839801624c0a3915
Merge: f21eaca 4dda3ec
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Oct 25 21:44:02 2010 +0000

    validates device parameter for attach-volume

commit 2317542ed51494d1fc5f3714b3a6848e0e59d606
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 files changed, 2 insertions(+), 1 deletions(-)

commit f27180bac526de04a868656f68dde5f98af5fef9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 13:51:09 2010 -0700

    nova-debug, relaunch an instance with a serial console

commit f21eacabb3cdb024840b6abf18773c54f54e9af8
Merge: bb76ed1 f3c450c
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 e9da0c94d64c23a81c57cf7d4f9776acc512516f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 12:54:22 2010 -0700

    pep8 cleanup

commit be748e828aa3452495624e71f97490201ff687be
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

commit 0aee80ed1746136807dc47392a024609b5be4ffc
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

commit 4dda3ec17de7507ec7d47870f1bedd898fdefdeb
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Oct 25 10:43:03 2010 -0700

    update error message

commit bb76ed1028ec7f729d3c5a369f696bdc3070882a
Merge: 207180f 8fc086f
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 8fc086ff912b1683aaf4b514fb9585d2e6c27c55
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:25:50 2010 -0400

    pep8

commit f208b58142b76122cfca5571b8dfc681487cf26c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:23:55 2010 -0400

    pep8

commit af02793e6dddc7ce32234aa26bbb715b7c038dbb
Merge: b2472b3 207180f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 25 12:22:29 2010 -0400

    Merge from trunk

commit f3c450c95bdefcdab0f8e14ff37b05288ac8a05e
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.

 tools/pip-requires |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 6aef1d0e327f568910bf99306c2592f382dd4b22
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 03:11:00 2010 -0700

    more bugfixes, flag for local volumes

commit 1f4ca3d3333c10fc3f4ff9132b90f676a0f19e51
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 25 01:37:01 2010 -0700

    fix bugs, describe volumes, detach on terminate

commit e28cccb00c17b5564862ef13ec53dddaa6b309a4
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

 tools/iscsidev.sh |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

commit 0b2986c03aa7fd37576bb3591798468435cd691a
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

commit 3b3c0f1e4f03f6dde8203bf80229643551fdeaf0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 19:52:02 2010 -0700

    logging.warn not raise logging.Warn

commit 008832504e0a050fc24dffe641746e7441ede70e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:56:09 2010 -0700

    whitespace

commit ec90b9193cba60d67fa5cf549b92e45b2dd9d8a0
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:54:52 2010 -0700

    move create_console to cloud.py from admin.py

commit 96bfaea149b6731fb225a7a180f9f65007a98410
Merge: df84577 207180f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Oct 24 17:41:53 2010 -0700

    merge lp:nova

commit bf62c4c6cff489001f6aca7420654eea85998a05
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 17:22:29 2010 -0700

    add NotFound to fake.py and document it

commit e749364220e726c0ebdd8e14cf965f3c3ce8351b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 17:18:24 2010 -0700

    add in the xen rescue template

commit 348467b09db279a0517b7eaf9aeb818655a98bd3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 16:04:35 2010 -0700

    pep 8 cleanup and typo in resize

commit c05b2b19234ccd1a2dfdbf11a7680598d262b3b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 15:37:55 2010 -0700

    add methods to cloud for rescue and unrescue

commit c9d8dee5a3c087e853afa5a1b76bf4e34adc4ea5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 15:06:42 2010 -0700

    update tests

commit e456d1b838f63fca91496b94311f525b5d43f3d6
Merge: 9dd014c 207180f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Oct 24 14:57:37 2010 -0700

    merged trunk and fixed conflicts/changes

commit 671ae0a7206eb2f389ccfa4c122ed7ae5d743314
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

commit 207180f61d17b812790785867002c19009590626
Merge: 050192e e104506
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 050192e21b8c725ba1a9b26dad2dc2b797a6899d
Merge: 2864aa1 de89cb7
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 2864aa111a04054a1f7519307ec242b6a733bf23
Merge: bb94dde 9244542
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 bb94ddeda800b2f1de75b44ee89dc60234d612b3
Merge: 6b15da4 7d056d8
Author: Rick Clark <rick@openstack.org>
Date:   Fri Oct 22 19:18:52 2010 +0000

    Created Authors file.

commit 7d056d8f3b9231d5fde6a4dac71bdb7bd147f4ee
Author: Rick Clark <rick@openstack.org>
Date:   Fri Oct 22 14:06:34 2010 -0500

    Actually adding Authors file.

 Authors |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

commit f0bb4b571306e000cd86a614086c0a9e3f9a17b3
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 files changed, 1 insertions(+), 1 deletions(-)

commit de89cb7ee78d2c3adc885b39df71136eae62ef4c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 22 01:54:58 2010 -0700

    speed up disk generation by increasing block size

commit e1045063d355653b48a2435cd96840f1f3df23ad
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.

commit ad4556ff47028a67dc6bd02f15c1070178a129fc
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.

commit 7aefbfc0edf24d36c83e8b4c65bad2ebf3cd6419
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.

commit 9244542a76b3e575c9099c254d57b02132b777d2
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.

commit 85a1714b0785f3fd55f84ecec483021d5ab8dfe6
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.

 pylintrc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ec37de01eb61c87597cfd7c5b5f6b2c3264a1202
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.

commit 58a2d14a73c04f6f296784f306959603cfc6ed9e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Oct 21 08:42:15 2010 -0700

    validate device in AttachDisk

commit 6b15da45603c17d8c28768ca8324e6011511f97a
Merge: 811d7c3 4f8324f
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 811d7c3f6a13727cd1dcb9c338263a3527cbf933
Merge: 5ee062e 9451d67
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 4f8324f1abff65fed2897b43c997960b3266292f
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Oct 20 17:06:51 2010 -0500

    Made updates based on review comments.

commit 5ee062ecb041989893a2426eb3c587ce9dabf0e2
Merge: 6628035 049ed3d
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 6628035aa304a107332078f97f7e803bef3bf2dd
Merge: 2b91722 4ad8191
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 2b91722bea0be781dc6961927c16d28c2b42eea0
Merge: b8ded78 e782317
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 4ad819167b880bb8b7d3e2400ab77130620d1e24
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

commit 9451d67c15cbe85030970f6f6c98e2849abafc31
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

commit e78231732ef0a7c0adf089f42f32bdf7a45e1126
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 files changed, 1 insertions(+), 1 deletions(-)

commit 58f0de4a411c02caa386d0875d6484a28413b38e
Author: Anne Gentle <anne@openstack.org>
Date:   Wed Oct 20 09:50:09 2010 -0500

    Updated documentation

commit b8ded785af4c58a013ecc9e1df54fc25d191276e
Merge: 2f8dda5 404a102
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 404a1029ca438750ea10b0075faa49f71df45e89
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 19 23:41:25 2010 -0400

    Also update version in docs.

commit 97a8281f0f5c730afb098dc3d1d471e219f094a8
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 files changed, 1 insertions(+), 1 deletions(-)

commit 2f8dda5acc5d695fe4ca9c34b8d60957cb64cd43
Merge: 2d4a752 49b013d
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 2d4a7527a508270df8b44c0d5aca1ea05b0c6335
Merge: 9d401b8 8693d6c
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 9d401b8c0c8b4bb1bd6d88abc293a650f87572b5
Merge: 4b2f7f6 c420559
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 049ed3d4d49c8f153e0e5d69aa19b683c0d3c532
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 19 19:57:24 2010 -0400

    Construct exception instead of raising a class.

commit dce37202c11125fc7a2cae031f8bd4af2c429ee6
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 19 19:40:57 2010 -0400

    Authorize Image before download.

commit b2472b3b0a8162f6cd55bd2bb0d82deb98c9d915
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

commit f4cb8977d2d2b8e08ad65cdc2cf3a584a4876618
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.

commit 4b2f7f6af035ce7f0e38cba1467a645b06b61746
Merge: 95c907b 94e8d9f
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 c4205591a91de4b1be7673ea47982dbcdf61057b
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 files changed, 1 insertions(+), 1 deletions(-)

commit 49b013da86c9fadb1a32dbc1de052ab60a42568e
Author: jaypipes@gmail.com <>
Date:   Tue Oct 19 17:39:12 2010 -0400

    Fix typo in test case

commit db452f09a2d370cbff5d3ecea6873053ca7ec97f
Author: jaypipes@gmail.com <>
Date:   Tue Oct 19 16:09:12 2010 -0400

    Remember to call limited() on detail() in image controller.

commit 95c907bfe757d03e1ed5a449d4a1ba626cf1485b
Merge: 4936036 b385a67
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 94e8d9fba9325a9a5e94b4518db7469fba4d7e52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 15:58:42 2010 -0700

    add reasonable gb to instance types

commit 8693d6cef6eecee0fc19fd365d179b444e17d759
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 13:40:03 2010 -0700

    it is flags.DEFINE_integer, not FLAGS.define_int

commit c74034470026a8973b32197ac935118c351f8c0a
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.

commit b385a6772d226e5ce04b4ca0b838e1a2438c66e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 18 12:46:32 2010 -0700

    update leases on old leases as well

commit 4936036363c776ae73e4dc49eddb702322b3e26d
Merge: 67c81c7 0707daf
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 67c81c789632277f487a40a6afa07fded8fc9bde
Merge: 4aaa584 fb1f12b
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 4aaa5846236a8059b00cfc87446b11d707e1b291
Merge: a322eea bdb3de5
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 fb1f12b8725d11a4eb4a04ca1dad439991062b96
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 files changed, 2 insertions(+), 1 deletions(-)

commit 26553460480daaf088406066818907f9fb5f31f5
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 files changed, 1 insertions(+), 0 deletions(-)

commit a322eea5ae58f695033b0f72c60350857a410a73
Merge: 4a80d7f 6495fae
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 4a80d7f019331b205de586b62c469d7ed92319cd
Merge: 37cd298 d997b74
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 37cd298545588a4a6c3778210a9e7c0cef854acb
Merge: 179d821 7259eac
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 25c7705a43e3efd7b7c658ba21c24e3377c7da5e
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 files changed, 9 insertions(+), 3 deletions(-)

commit 179d821b1471b7fb92d7ecb1566242a5dbd51aa5
Merge: 93f06eb 48a190a
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 6495fae4fe3b91e9015f32da951d42956b9e7073
Merge: 200853c 93f06eb
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 23:59:23 2010 +0200

    Merge trunk

commit 200853cb80b8d882569a57c057bc59d1e45f20b3
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*

commit 93f06ebbf8068a751a7b569a35be8e02cdc75057
Merge: dcca3e9 0d14db5
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 48e8dc28ddaa6eaebb6fabbf9f36b193ff7eb408
Merge: 777b157 bcbb885
Author: jaypipes@gmail.com <>
Date:   Fri Oct 15 16:24:19 2010 -0400

    Merge trunk

commit 777b15791f54e6f8941f2a82f32a7a04f2e3599b
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.

commit dcca3e93b7db132b26610e2988d265a5abf9711d
Merge: bcbb885 01ce2c7
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 01ce2c70d5de320272aab07dd14876abbc253543
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.

commit a566d2dae33bc543778f5d00b89851eb66f50a92
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 15 21:46:29 2010 +0200

    Perform a redisectomy on bin/nova-dhcpbridge.

commit 1ec386a50b735d974dfa704f52120e860e5b5525
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Oct 15 11:06:16 2010 -0700

    Removed 'and True' oddity

commit 7259eac5f8cb09362118ac4025d7a8c203518bf4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 10:08:49 2010 -0700

    use context for create_networks

commit bcbb88502db99ea760929f22d856c3ee16be894a
Merge: 6667a72 a5e03a5
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 48a190a7c9d099ef2a8d196f6072789cd65e3c89
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 19:27:39 2010 +0900

    make --help work for twistd-based services

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2cc0914048a28bd92a092c12a6780fc52dfc6e21
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 17:54:38 2010 +0900

    trivial style change

commit 04fa53004969ca9c3a4e7b84e10fe5b9b5b80ebf
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 17:37:26 2010 +0900

    prevent leakage of FLAGS changes across tests

commit 6667a72653687f12976ed95925546eb461071929
Merge: 902e5ae 88e2913
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 88e2913843815ecc7695a75682411ec2820524f2
Author: Andy Smith <code@term.ie>
Date:   Fri Oct 15 16:06:12 2010 +0900

    Also accept 'y'

 run_tests.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 902e5ae6505bcb6132139200fa2d645af6afccab
Merge: 34e6e61 9003916
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Oct 15 06:28:32 2010 +0000

    A few more fixes for deprecations.

commit eaaf6da89fa47c9426dd3bd0fdecb3314a4e22c3
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 files changed, 1 insertions(+), 1 deletions(-)

commit bdb3de5b4f4a5f728815375032aaa38ef8eb520e
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.

commit 9003916059a65e0c682f6ebb8367ca091f989c99
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

commit 0d14db53c12641f9f82f2a7051b0899c2c346bde
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.

commit 34e6e61f3f177b66aef2b3b52b4e5dceccb56c2f
Merge: ecf074e 11ff7f3
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 11ff7f386fa35f117de9a33919d4e74d3a7c3903
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 14:00:01 2010 -0700

    timestamps are passed as unicode

commit 02f2e2a426dfe86c783e0debec4a490360f4ce81
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

commit 684d32397ba4a8f40191f0bf9d6eb5770464c239
Merge: 9de1ab1 ecf074e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 13:40:56 2010 -0700

    merged trunk

commit e02ab41717ac9bc003052c93dc1f80911dbe7d19
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Oct 14 13:38:35 2010 -0700

    Minimized diff, fixed formatting

commit 4313d559eaedcd4dcbce8319b5c96686eea4f406
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 13:37:49 2010 -0700

    remove nonexistent exception

commit 5d1b6948edcb2d3618247ca7a0c6a6b3ddcf2779
Merge: 198181c ecf074e
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Oct 14 12:59:36 2010 -0700

    Merged with trunk, fixed broken stuff

commit dc4020e5492ae2893cfb95a33893e9ba8584bcaa
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 11:56:25 2010 -0700

    revert to generic exceptions

commit fa5e4c6cdd43ce8513caa392eed282e2a3084434
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Thu Oct 14 11:27:42 2010 -0700

    fix indent

commit ecf074e42fae126e36fa53587234aa7465506a22
Merge: ef8b056 aa4047a
Author: jaypipes@gmail.com <>
Date:   Thu Oct 14 16:08:42 2010 +0000

    Fixes LP Bug#660095.

commit a5e03a5b0ffbff137e7022587dce8c1e093958eb
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.

 run_tests.py |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit 59151d6a3ca8f030511fc9b01b2ee8fc5ae4d5f4
Merge: cffef3e 7012bda
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Oct 14 14:12:49 2010 +0200

    Merge trunk

commit 9de1ab116122e166bf601da82166db8fa5a925d0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 01:46:06 2010 -0700

    fix nosetests

commit ef8b056b26e6f996f060dc2cbc88aaa300b54787
Merge: 7012bda 4fcf57d
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 d997b744409bd5a41e2bd7ca9cc55c30cd2b2c1f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 01:11:18 2010 -0700

    unit tests and fix

commit 0707dafd64163f7a48115d6c4d91d126890fabf2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 00:43:19 2010 -0700

    call stuff project_id instead of project

commit 1dd944636566d023eff7377c8eb0522d869e2414
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Oct 14 00:30:42 2010 -0700

    review fixes

commit 839fb878e605ffd6a88df1f7497c6b94a63d9dfd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:44:04 2010 -0700

    fix context in bin files

commit a983ddaca0ad7281f11d6dd46145e5cd7e501ef5
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

commit 61842fe3a6cd41d66f2fa102aa06b4f4ea087367
Merge: 02ac7d6 ef8b056
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:27:23 2010 -0700

    merged trunk

commit 02ac7d69e47d9ab8c0f83379f17a85bea72ea9ca
Merge: c6aa370 4fcf57d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:26:58 2010 -0700

    merged concurrency

commit 0b36440650e0bfb85b2f5c1370c65fbe3a471718
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 23:21:22 2010 -0700

    review comments

commit 207442d1ee87617750af1eb7910d4cc02ee15892
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 23:19:25 2010 -0700

    Added a unit test but not integrated it

commit 4fcf57d18f88fdf712dd619866079cbdab887745
Merge: c5aa739 7012bda
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 23:17:40 2010 -0700

    merged trunk

commit c6aa370b4eeb4d34c8990e21b8c18dc98537bce6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:51:55 2010 -0700

    fix remaining tests

commit 06e95b9b803bc0a425c18f9fa198088e516f6099
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:18:01 2010 -0700

    cleaned up most of the issues

commit 05a09ac6895fbd4530ea7bb6bbc41b2287c163aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:09:29 2010 -0700

    remove accidental paste

commit 512ffabff443a06dac736ca898d014e936756377
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:07:43 2010 -0700

    use context.project_id because it is more efficient

commit 47a6308dab805fe688da817df8dc9b8dde21796a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 22:05:21 2010 -0700

    elevate in proper places, fix a couple of typos

commit 8fb71d1f878c5b33391b54aafd3f9bf3e76342dc
Merge: 008e133 7012bda
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 21:42:10 2010 -0700

    merged trunk

commit 7012bda1fa398e2dc17565f7fe53f06dddaa5a6a
Merge: f823e57 1892027
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 1892027c50bcda43741e1965d60d2daccf43ccc5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Oct 13 21:55:01 2010 -0400

    Address cerberus's comment

commit dfc220e1c119a0ebdb1e374e37b0e12b435cfcf1
Merge: a3d072d f823e57
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Oct 13 16:36:33 2010 -0400

    Merge from trunk

commit a3d072d9804eecd4c9afd09f0fa67196cff2d475
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.

commit 3a31dce13cdc918049b9cf2a0f48679c92b177b2
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 16:34:23 2010 -0400

    Implement the REST calls for create/update/delete in Glance.

commit 19b32ffdd50876dc49ad676e37c1d76a30f92f40
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.

commit fa550f7abd9bff3810badc6fcd0bdcd9af8bd7ef
Merge: 72cc7a8 aa4047a
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:31:46 2010 -0400

    Merge fix for Bug 660095

commit 72cc7a8fffb70c2223fcc4bd8c26128cd99ce5ef
Merge: 8b5da6e f823e57
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:31:32 2010 -0400

    Merge trunk

commit aa4047a467222bd175b2cac9b9b8452028956c40
Author: jaypipes@gmail.com <>
Date:   Wed Oct 13 14:17:03 2010 -0400

    Fixes LP Bug#660095.

commit f823e57f3498e967bc544487de84e89db96ab4a8
Merge: 2fef57d 068953a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Oct 13 17:13:35 2010 +0000

    Xen support.

commit 2fef57d6ceece3bb4dc7fe672efc8fe7de781bc0
Merge: b783b91 5ee7421
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Oct 13 16:35:41 2010 +0000

    Adds flat networking + dhcpserver mode.

commit b783b914a297df4b983ee074cc7db1c465374300
Merge: a114eb7 a5a4e6a
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 89bd14c584df71de4fc336b5990b91a2bc69b03d
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Wed Oct 13 00:06:29 2010 -0700

    Newlines again, reorder imports

commit 70863fe9d50c961d1f7484a2e7f4c6d68adae34b
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Oct 12 23:53:31 2010 -0700

    Remove extraneous newlines

commit d4eceb766366ecbdaaa648d2159a0f914cf27889
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Tue Oct 12 23:45:30 2010 -0700

    Fix typo, fix import

commit 5ee742143adabbced76c6e59711cac23218daaa1
Merge: fbecc45 a5a4e6a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 20:16:23 2010 -0700

    merged upstream

commit a5a4e6ab95b1ec7a3e0241bbe44f22a1b7c42772
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 20:13:06 2010 -0700

    cleanup leftover addresses

commit ed2e33f211fbac0d881fb6791efd36c47ca747d0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:37:09 2010 -0700

    super teardown

commit 600c59c207585507535a611acefbf0535967232f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:27:48 2010 -0700

    fix tests

commit fbecc45221a4f3fdb80b8b0f6f8eecb55a229e92
Merge: 6192ce7 e346272
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:05:53 2010 -0700

    merged trunk

commit b7881ca29cdbb3e1704a02822624f64549d826dc
Merge: c98e129 a114eb7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:02:04 2010 -0700

    merged trunk

commit e346272fc65b322a91b5f4dda93e4162c253eb33
Merge: 5cb11e0 a114eb7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 19:00:34 2010 -0700

    merged trunk

commit c5aa73928ab81a569638e9e2f726507a82b37ef5
Merge: 40673f7 a114eb7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Oct 12 18:55:09 2010 -0700

    merged trunk

commit a114eb7c7a1b5169f499a78c74067f09a507c529
Merge: 08a0378 db412c4
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 db412c49c4873dbca364d3acbd531a16bbf3b3c3
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.

commit e1177a4795e8ddb2717639a4c2ade6ea4bfb084e
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

commit 068953afc06d9e36af96c9eca40b849a8f05af8d
Merge: cda0f94 332f2be
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 22:52:10 2010 +0200

    Merge trunk

commit 08a037835053cc18735ff6cef110c15bc3774484
Merge: 332f2be cab5c96
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 cab5c96b51691bddd016ea702507aa3acb9706a4
Merge: 24b309c 332f2be
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 332f2be6224eef64f0b3374d11ff3301c48694ac
Merge: 2aa4084 004474f
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 24b309cd79e707a5296184237dafd3803daefc00
Merge: dc92cc9 368db82
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 22:04:46 2010 +0200

    Merge trunk.

commit 004474fb4ebe3e2d8a6b12fbb68721e5d002fe81
Merge: 9fbd9e3 2aa4084
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 2aa40843c351129c0a1a765f52ad8d1d364f7725
Merge: 368db82 9fbd9e3
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 9fbd9e36a4c313c5e3aae72de095a05768f748df
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.

commit 13a4a7fdf1575292dcd52f68fb029fba8cbf6f2b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 12 13:09:35 2010 -0400

    Fix bug 659330

commit 368db82e9ef8ad22a19c74579d0acbadf6274408
Merge: ffbee4e 25acd22
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 ffbee4e709f881d9b2953beacb643e5376d1dd89
Merge: c594771 4eaa781
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 14:13:23 2010 +0000

    Improve the virt unit tests.

commit dc92cc9e2b396e46f365bbf9c83ddf130818db32
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 14:29:57 2010 +0200

    Remove spurious project_id addition to KeyPair model.

commit dd28f7fd121491b76a05979e0a93121fb30c4b39
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 09:24:33 2010 +0200

    APIRequestContext.admin is no more..

commit 796c098b6f30c7cc579b37dd62989dbb729f2279
Merge: 1e96f76 c594771
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 12 07:21:25 2010 +0200

    Merge trunk.

commit c59477149102164655377f7b9c882abd8cf351d5
Merge: dc7e4a2 46b6317
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 dc7e4a2439e89d71f075e41f378551bdc8140a7e
Merge: 0816e71 c79204a
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 0816e713e749e64cd23f505099fad3e896c1b4b9
Merge: 63ab263 4976420
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 63ab26308c18db1636a3a86837b00713007800d6
Merge: e2edb6d f293cdc
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 c79204ad56a6a9f9250ab943e3c26ac811640f4e
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'.

commit 46b631735c2bb6813438f8340c827a44750f1746
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 11 11:21:26 2010 -0400

    Fix bug 658444

commit e2edb6de63633cf27f6b95f2da2ae2c3d5faae48
Merge: a1b6bc4 e3a5f02
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 4976420d6d207861ad99e7ca68f46050c693a5ab
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.

commit f293cdcf99ea9ee5507c53506e9e64ea1db95924
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.

commit 0e188c104b1118df5a845cd10d26942725f6b065
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

commit 82dbdddc68ec7286c61ad4ebc4ed399143a2bfed
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

commit 248f8b5f6c26d27b5a0461c3bb58c65aecef982f
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

commit 8e5d8e4cb25e7e3630bae7de60fda3c9a170ac69
Author: Chiradeep Vittal <chiradeep@cloud.com>
Date:   Fri Oct 8 17:57:49 2010 -0700

    hyper-v driver created

commit 6a9215558a1fe7bd9440bdab8923c43f159bb0ec
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.

commit a1b6bc47487b053c5e2581c02321f90343b189b8
Merge: ab4eddf ab16b90
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 ab16b901005207bf41060b24f9b7829a49cbc449
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

commit d34b5d4fcec93778dc1429d815f80d0ce638b1f7
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 20:39:00 2010 +0000

    Mass renaming

commit cda0f947b05fe33296da6f8a26fa11a68b32e9cb
Merge: 0b2c004 dc466cc
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 8 21:41:11 2010 +0200

    Merge trunk.

commit 890d2f7cae3be0b6faff6b5b590ef1653e5f84e0
Merge: 5cb9ce9 ab4eddf
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 18:56:45 2010 +0000

    Merge from upstream

commit 5cb9ce9d4606bb536402134788e88b9df0231853
Author: mdietz <matt.dietz@rackspace.com>
Date:   Fri Oct 8 18:56:32 2010 +0000

    Start stripping out the translators

commit 8b5da6e9a858db1f0936786e16db50e24092dfaa
Merge: a0ec590 ab4eddf
Author: jaypipes@gmail.com <>
Date:   Fri Oct 8 12:38:05 2010 -0400

    Merge trunk

commit ab4eddf15abd3b9947815f9f8c202a30999a4ad9
Merge: 9bf6b09 8cd3c3c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Fri Oct 8 16:33:33 2010 +0000

    Remove redis dependency from RS Images API.

commit 8cd3c3c20f7d5a15b8363d4032bfad86dd24a27c
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.

commit 9bf6b09b70e1ec2003872e045c1d210454e72f6a
Merge: dc466cc 4210f7a
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 4210f7a39ff931dde89f1f943f6ba76ec156d366
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.

commit 1958529caf19593ee3b8c3a13187e2be22542742
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.

commit a0ec590ddf2c88b4a3be09c675171f4a0e25284b
Merge: 6b89f9a dc466cc
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 18:00:48 2010 -0400

    Merge trunk

commit dc466cc6d9300566aae74224de86d91961b72ffe
Merge: 7bd4b1b f08191d
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 21:08:47 2010 +0000

    Cleans up a broken servers unit test

commit f08191dbc7562e523ba01a443daaae3b41cddb03
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 21:00:05 2010 +0000

    Merge prop suggestions

commit 866e82d3043a97656955a7af365b79d0ba34aa30
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 20:43:23 2010 +0000

    Huge sweeping changes

commit 7bd4b1b03268cc346dcf4f4b258bde611f08a0f9
Merge: 8627225 6b89f9a
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 862722535aa71379ec906946fee37a45799fbc75
Merge: 105a90d 37d4d67
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 20:23:35 2010 +0000

    Typo

commit 6b89f9aba76547fbe35f6e3b3036effc63dbf468
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 16:19:55 2010 -0400

    Merge overwrote import_object() load of image service.

commit 37d4d67bf281addeefade15fe7c9e4965fab25aa
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 16:16:42 2010 -0400

    Missed an ec2_id conversion to internal_id

commit 2fb1442f23ae81f2460ee07cb8c64e98d1a4aada
Merge: ef26e3a 105a90d
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 16:14:21 2010 -0400

    Merge cerberus and trunk

commit 105a90d5709cc858ab08e5e0ce5c3811a25fa4d1
Merge: 0b455fe 5014693
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 501469334bf9282cc5a01a368c8477f1ae0294c2
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 20:07:11 2010 +0000

    merge prop fixes

commit 16f117a0934230389122176cf40cafbbc5ecc31b
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 19:52:12 2010 +0000

    A little more clean up

commit ef26e3a43f336d32cca6e4aa24366508877c3e5c
Merge: 5d8cecb 0b455fe
Author: jaypipes@gmail.com <>
Date:   Tue Oct 5 15:48:47 2010 -0400

    Merge trunk

commit b3bb8e31d0e36bac6703abcb9542e8103b5bfc13
Merge: 1e6788f 0b455fe
Author: mdietz <matt.dietz@rackspace.com>
Date:   Tue Oct 5 19:37:15 2010 +0000

    Merge from trunk and conflict resolution

commit 0b455fe03d59e8e11fd1c9659ecccd253f07a7cf
Merge: 9f5cc6f b158382
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 b1583824f0203b2ac55a75d7ce149f5632acb8b5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 13:40:17 2010 -0400

    Fix clause comparing id to internal_id

commit 5d8cecb716f0f3c52da186af5a7cc19ba3c85930
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.

commit 15bcaa30d700d41bc492452378e82e9b5566f344
Merge: f7ff5ca 9f5cc6f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 10:56:03 2010 -0400

    Merge from trunk

commit f7ff5cac412a7bd8fe1348c819d1924dc4c2693a
Merge: b473339 a72b8a4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Oct 5 10:55:31 2010 -0400

    Merge from trunk

commit 0b2c004dc03160bfdfa09dde77580fecde20a9fe
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.

commit 7a036f44979259e2e47acc7a9bff9a3348504828
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.

commit 788a686ae932f0b2cdbcb982e67a9c18a37551e4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:21:31 2010 +0200

    Stub out ec2.images.list() for unit tests.

commit 5d6e85180f39a168e40a8cb584e17dda1fc3abe4
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.

commit 32bf4953f497b76cca15697a59f82cee52bc2813
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 15:20:23 2010 +0200

    Add a connect_to_eventlet method.

commit 8c0616323098ca6a47f7e82524a9eee336151d9a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 11:17:03 2010 +0200

    Un-twistedify get_console_ouptut.

commit 4eaa7811234b9a86a67388e4271baeca0da7ca0f
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).

commit 8fe1a090a23d8941387477ae89810319012707cc
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 files changed, 1 insertions(+), 0 deletions(-)

commit 1e96f76e31c9e107f286d0d8be9a7689dbc39605
Merge: 9645b59 98fcb58
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Oct 5 09:56:58 2010 +0200

    Merge trunk.

commit 9f5cc6f1e2ecf8a293d49fc1ffa1c18931c72d90
Merge: 98fcb58 e9a2bbe
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Oct 5 07:35:46 2010 +0000

    Keep handles to loggers open after daemonizing.

commit 5cb11e0771cfe22fd6d747c6d9271372a5ac8493
Merge: 165dbfa 6488382
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Oct 4 19:44:51 2010 -0700

    merged trunk and fixed tests

commit 98fcb582d2c3b4bd5afb879f01e8c08b2bc53fcf
Merge: a72b8a4 d8c1df4
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 38e1d1b50f4a3b5bfd67007d34ca70a31aaf4480
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 17:32:01 2010 -0400

    Update Parallax default port number to match Glance

commit 1e6788f62ee5429ba34984aae7be17b2b8976ad2
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 21:20:33 2010 +0000

    One last bad line

commit 991826162b848e2c3bf8c811f62089e3207eabf3
Merge: 5c56204 b473339
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 21:08:08 2010 +0000

    merge from gundlach ec2 conversion

commit 554030771c099a5cc1549b66c84959ca37b6343e
Merge: c7d20b9 a72b8a4
Author: jaypipes@gmail.com <>
Date:   Mon Oct 4 16:51:03 2010 -0400

    Merge trunk

commit c7d20b93cfa85eae2c4630e7113df12f0ebd755a
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.

commit b473339bd3413be3ca78f23e7af0506e4104fac3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 4 16:39:05 2010 -0400

    Fix broken unit tests

commit e0a26e381fa0790e12c4d07d66b22c6c64d15624
Merge: 3a423f7 a72b8a4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 22:32:00 2010 +0200

    Merge trunk.

commit 9645b5977c6aad6a4dc628f20a5a5ba367a3aa43
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

commit a72b8a4f69b271f9cfe24b72f6e707feb5d919a7
Merge: e70f45a 7d0a257
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 360636762df3d3d65c853b823f7b6ece1dd5f501
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.

commit e70f45a9203236cb26f709756a6f5182820838e5
Merge: 9851f09 cffef3e
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 9851f09a813439c93e39f916739c226d428273e5
Merge: 9df1333 1fe3553
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 1fe355360c0122a03bc2672db722f7f3289e2cee
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).

commit cffef3eaa48356ca4654773a22c8ed9a0e68cb44
Merge: 4d099dc 60e5f5a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 20:36:46 2010 +0200

    Merge trunk. Again.

commit 7233c75b17221af0fb6dde6d6b65fae07dff444b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Oct 4 14:26:55 2010 -0400

    Revert r312

commit 9df1333747de99790e1d3ebd35ee927d0ba41007
Merge: 8357f36 18418ae
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 8357f36fabae12a672e118b3cdb90a499961a0dd
Merge: 60e5f5a 38bc638
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 5c5620481c55d49db6207a25f68606321dbdf5bd
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 17:52:08 2010 +0000

    Accidentally renamed volume related stuff

commit c54b63b52b26d8ef81a6b2ef498e5ae8073fe444
Author: mdietz <matt.dietz@rackspace.com>
Date:   Mon Oct 4 16:01:44 2010 +0000

    More clean up and conflict resolution

commit 00700e1b7137e5f93029bb0112cdeb0b60b5be05
Merge: 58876c5 60e5f5a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Oct 4 12:53:55 2010 +0200

    Merge trunk

commit fdf78ebcf278f2ea761a54205fab535a4bcf779a
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.

commit 60e5f5a893b1612ee36278adfe6e83059556553d
Merge: 8e096a8 03d9e04
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 8e096a8d2d110ffea40e5924d36296753a899542
Merge: 143eff4 63de878
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 143eff481af0f6da7108c53c75cb28f3291fcd5c
Merge: 6488382 128ff44
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 128ff446a33968219bc9abec6864df52b5328d05
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.

commit 38bc6389e9938d6474fec9b19cb78eaa09d5ee1e
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.

commit 25acd225bb9a60fc7f6b9f9396acc6a63eb6d3f3
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.

commit 18418aec593ad7abe8beac8355750bb1e2a6792f
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.

commit 165dbfa8643dc4788d15795a58deda80c45371a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 12:46:12 2010 -0700

    fix typo in setup_compute_network

commit 008e13343234bab6ae96f6f0531548545d8d600e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 12:29:58 2010 -0700

    pack and unpack context

commit 534343370c0e7522686cf1e3291dee4632990bb3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Oct 2 11:39:12 2010 -0700

    add missing to_dict

commit 7d0a25758ffdc8bffdfeadd28c0c9b3ac359feb8
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.

commit 03d9e04a71757a34007a509167ce6155d9372353
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.

commit 63de8787d3665965ece52e0257b71361c8ebc39d
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.

commit 4d099dc5efbffc537b2ecf823fdfc53067b1fdfa
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 12:56:54 2010 +0200

    Adjust db api usage according to recent refactoring.

commit a71a5ef029697f25d041aea617978df2d06625c0
Merge: 49045fe 6488382
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 12:40:30 2010 +0200

    Merge trunk.

commit 0f0409d663bcc71a67f1e30569201dff97d3d396
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.

commit 70a0b53c9a45f91b8a0aeb4953a45c74b58be680
Merge: 51c1fae 6488382
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sat Oct 2 11:12:46 2010 +0200

    Merge trunk.

commit e9a2bbefc76d587bfbca0c90763af03be5b21dba
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Oct 1 21:46:36 2010 -0400

    Keep handles to loggers open after daemonizing.

commit 16ac2f9cee305d4fac2ace14bef8f93e8138ae50
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.

commit d8c1df41b18775639016e2bf63fb215f9f0168e5
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 :)

 tools/pip-requires |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 648838220465c58a15dfa27696e5ea0aa7ab0f3f
Merge: 99def43 a6da70d
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 c98e12990c89ecf0db24f5631666fe75ccc4ef18
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

commit 7f7b128fc7abe00047c4484161138eabaeca89bd
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.

commit 49045fed3e3501c67aac16a186d2c2d358c2595b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 13:03:57 2010 +0200

    Address a few comments from Todd.

commit 58876c5bbddd30491e328f4fb7635e6f1ffc065d
Merge: 850b1e2 99def43
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 11:48:55 2010 +0200

    Merge trunk

commit a6da70db37a858ff4822d9c150aabd468bf9f1ae
Merge: 9343ab5 99def43
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Oct 1 02:28:31 2010 -0700

    Merged trunk

commit 9343ab50f020e9176392d3bab9267ee4c66a9ae7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Oct 1 01:44:17 2010 -0700

    Locked down fixed ips and improved network tests

commit 850b1e2e6408d7ff592e2856892831fb94f6e973
Merge: 3129b29 7c855ce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 09:58:33 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit 6192ce7f7ee1d16d17b97870b4222e228d0aafd0
Merge: ea137d1 1655207
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 23:35:11 2010 -0700

    merged remove-network-index

commit 1655207bc764a890799dea26e23f997b371d58e4
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.

commit 6c0f04fe6a040bb75648305eee6e0935318f4328
Merge: 55b2f4d 99def43
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 20:35:09 2010 -0700

    merged trunk

commit 7c855cede1354b23cab3f00b706f71fbb35471f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 20:24:42 2010 -0700

    show project ids for groups instead of user ids

commit 048f19f7afb012a5887a15d1a647acb1109a0a94
Merge: 72c2070 1a26dd2
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 19:29:57 2010 -0700

    Merge from gundlach

commit ea137d1c524b0f2e310c330d09638f147e3767f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 19:21:50 2010 -0700

    create a new manager for flat networking including dhcp

commit 1a26dd27346fa14531dd04cbe395c6125d90145b
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.

commit 4c3bfb089c81d0cd5a4b961bea52b085025cfeea
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

commit 4880be2637bbc91cf645a23aed6185a904a9d227
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].

commit 72c20702d18244f64f2c3ed6adf00804bf2bca72
Merge: 3e3aa61 80e611e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 18:43:44 2010 -0700

    Method cleanup and fixing the servers tests

commit 40673f7884a22cc5248321c155db9d2ca483657a
Merge: 36bdbf9 99def43
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 18:33:23 2010 -0700

    merged trunk, removed extra quotas

commit 99def43ad70e67a52ca0779bd0888a4ca4711eba
Merge: 5c6e803 594733a
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 80e611e52dfdc8c8ad8319ac6036798c7d8cdf19
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.

commit 594733a9afa3a8263f5ab39bbb9cf671519f2176
Merge: ae08bd2 5c6e803
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 30 18:13:45 2010 -0700

    merged trunk

commit 3e3aa614644eae024599c389c84c0d18a57602c8
Merge: 5c6e803 4426bde
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 20:10:57 2010 -0500

    refactoring

commit 4426bdea480a2374cc040e99b5b65b91ab2321d1
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 20:07:26 2010 -0500

    refactoring

commit 5c6e803b7968a0e9e36d149a6ed3a57b2ae2b4ca
Merge: 260059a 5a616c2
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 260059ae5e5b8156c9a41591bcd00503ca80dbfc
Merge: 72458cf 72fb9e9
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 72fb9e9bf36dfcbbae23885539fef6c20b4b834f
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Sep 30 18:48:45 2010 -0400

    Mongo bad, swift good.

commit b6f7e18615c4a8c2da124639cb5e6ce2127c10b7
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Oct 1 00:42:09 2010 +0200

    Add a DB backend for auth manager.

commit 72458cf35cacef1aa5c9e1263220a42b802266b5
Merge: 6a8ef86 e5e986d
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 e5e986d7ade8b58b21df8369bcd906a456e95e50
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.

commit 6a8ef86cc7ff6c7869c15850787f9127be5a9507
Merge: 7e04a2c 8128b59
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 5a616c2854d2fd68e62b828dca0515a203be2b1e
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 30 09:22:46 2010 -0500

    Grabbed the wrong copyright info

commit ad93737be3670702f07803fc354d95a5540d8304
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 03:13:47 2010 -0700

    Cleaned up db/api.py

commit 9ef1c9bee5a665ab840c2e5b196b09229eac0513
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 02:47:05 2010 -0700

    Refactored APIRequestContext

commit 8128b59ae77987e2e97356c2316645e7336efb5f
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!

commit 06d09e9ece12e115007fba95ed446e89969e25fc
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 02:02:14 2010 -0700

    Simplified authorization with decorators"
    "

commit d166b6d59bf816159ee933436941518eee6a113e
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 01:11:16 2010 -0700

    Removed deprecated bits from NovaBase

commit 04b0f3c91bbf2a67ffc8cceb3fee3fc139db1fb5
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 01:07:05 2010 -0700

    Wired up context auth for keypairs

commit f53e8ebaea7984cfc61d1bfe145b963585a90000
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 30 00:36:10 2010 -0700

    Completed quota context auth

commit 7d831430b74745701a92ffba7006227ddc861caf
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:54:15 2010 -0700

    Finished context auth for network

commit 2a7905f422b5b6b47d0813eb89769880b62dc038
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:35:24 2010 -0700

    Finished instance context auth

commit dfa4fffb69459927690fa3a4d5182aaa094d81eb
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 20:29:55 2010 -0700

    Finished instance context auth

commit f037f69aed81215143107b8c293f89267331fbaa
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 19:09:00 2010 -0700

    Made network tests pass again

commit 6e38bc5f5a025c524dfdb9debc1373d2d92ff433
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 19:28:14 2010 -0500

    Whoops, forgot the exception handling bit

commit 329681df424d1caec18a27c678fec98325ad697e
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

commit 9c7aa0d56e02b72f28958cd473e42f01c54cff53
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:52:15 2010 -0500

    pylint and pep8 cleanup

commit d6d3a441c3a3f60c8340f4a501aaa1294ff93a01
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:40:46 2010 -0500

    Forgot the context module

commit 1b1c3a5057fcabe85b6a92ba610ea7d1ea6c40fd
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:36:26 2010 -0500

    Some minor cleanup

commit 30f8c443d13a5b8f2e979d8658d6ae6ddf8511c9
Merge: c6cb8d1 7e04a2c
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 c6cb8d153249d49ddcc3cd59db5e2a776eb55953
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 17:06:35 2010 -0500

    Servers stuff

commit fff06ed28f6168b3852aa7cc9a0a9e21f674fcf1
Merge: f873d48 2ea08ea
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 16:29:57 2010 -0500

    merge rsapi_reboot from gundlach

commit 8489def8c1d30999308146c282d02a6d4936509d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 14:27:31 2010 -0700

    Wired up context auth for services

commit f873d4891fe45d9ce9eb92d6596f12151078eb7b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 16:21:28 2010 -0500

    Server creation up to, but not including, network configuration

commit 25fe06448d9807daf0920d8e9f4e74c653d374e3
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

commit 2ea08eaca0c112bb60210f7ffac3da074a27a9a9
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.

commit 7e04a2c305f1242e60339b73aabdb7872247279d
Merge: ad3fb6e c8eb464
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 c8eb4640c21f1b4db3de9dbda74912c9b9ee3c87
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.

commit ad3fb6ee907dd45f6a491c1c7848bdb19e833b29
Merge: 327478c b358f1f
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 b358f1f94d54ee1bc3838766eb96e12a08592fee
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 29 14:12:02 2010 -0400

    Remove debuggish print statement.

commit 9414e1bfbb20185e7c325717581143c4fe93c420
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 12:58:40 2010 -0500

    Make update work correctly

commit 79f098b2516a671d6fd17f8e9a5e3b2d0e738f85
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 29 12:16:53 2010 -0500

    Server update name and password

commit 327478cf003f97ac44f2ca1967b1f34f4ea2fab3
Merge: 24bec3f 7144691
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 71446915af351cae325e7f261bb0012dfab6c4f8
Merge: 01734f1 24bec3f
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 24bec3f01f7983920ccbc1426a0cdf78b84b9d45
Merge: 68d3777 e355101
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 01734f1ec1d1aa0b99781ddab1d4b543280f11ac
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 11:37:26 2010 -0400

    Limit entity lists by &offset and &limit

commit e355101f4122b27738f284ec2c0203e5a15b368e
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

commit 21d15fe940db90d41c373d284848c81769daba9a
Merge: ecefc7a 68d3777
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 29 09:39:24 2010 -0400

    Merge from trunk

commit 1850ed54b0a672f05798b45edaf79169042f2f89
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

commit 3129b2903792dc61dd663f741d508a8416b859fa
Merge: 3ad656a 401b75a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 13:39:09 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit 3ad656a1a8f2355d078965741abde9252c1e92a7
Merge: 0de9c04 68d3777
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 29 13:29:45 2010 +0200

    Merge trunk.

commit 51c1fae463ce9b4a2bb700c2b689ed7c49f6a62f
Merge: 2f8fce8 68d3777
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 09609b944506373f0f6b09e932197ade7f772cda
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 01:58:19 2010 -0700

    fix the primary and secondary join

commit 62ef0b55fe303fce13e7d9c81a1b36f27102faa7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 01:33:30 2010 -0700

    autocreate the models and use security_groups

commit 0de9c0407ec16e54e8a18127dae7fe69eb8e2096
Merge: 1d988fe 3b17431
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 ff4e080c615361e8af8f09a3ec5570f9d22dfb3c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 29 00:49:04 2010 -0700

    Began wiring up context authorization

commit 1d988fed47dc581aa137ccbf5daf5a67bf0f983b
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.

commit 401b75a2a88ccd9142a0c6856d0fe26c05b58444
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:42:18 2010 -0700

    removed a few extra items

commit 30d4f2e42d28c9946c7f5669da7e4b5df36d0646
Merge: 39f750a 0de9c04
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:35:03 2010 -0700

    merged with soren's branch

commit 39f750aff5f8c3ce3d3ee4b96e073b0997cf276f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 00:30:35 2010 -0700

    fix loading to ignore deleted items

commit 68d377700876ba768be37f36e2d4934cd2809403
Merge: 6fa690b 0f29d0d
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 e2e69826b489923a0c53633d66ac020a6546cdde
Merge: 3c0d027 68d3777
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:11:11 2010 -0700

    merged trunk

commit 3c0d0271abead48bff5a27fcb7abc316e3f80876
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:07:26 2010 -0700

    patch for test

commit f981f425f1581fc1740f479404458b5f710a8712
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 21:03:45 2010 -0700

    fix join and misnamed method

commit 7c9ec5401c7f84037e17945b6c7cf6cd7c8ccf28
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

commit 0f29d0d265834439dacd04ba0e34bd23ce6a9b84
Merge: cb9b690 6030b20
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 23:38:32 2010 -0400

    Merge trunk and fix test.

commit 6fa690ba5fb2d986e07a648def1a5f98defe5b1a
Merge: 6030b20 9bfad19
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 6030b20565bcad8f04d6b712af3570160616ab12
Merge: 11bab65 cc107a0
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 9bfad192224ccf9ccf470b89e93f98b33a3ea997
Merge: e09d194 11bab65
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 23:23:41 2010 -0400

    Merge Trunk

commit 11bab658f7a41f46d89cb75d02dd0eb4a631b633
Merge: 84b2e53 d3a9195
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 29 03:23:09 2010 +0000

    Fixes reversed arguments in nova-manage project environment.

commit 84b2e5335a573205738c22bafeea1ceaf1c6a3b4
Merge: 3ca6593 2c0dfa2
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 3ca6593595af37bae3ad0242a6ebbb399c9a63ce
Merge: d09cbbe c363dbf
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 d09cbbef75a47ff2a979f65fdd68665a18f2d7d2
Merge: e66391b 67a6b6c
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 7ec6839a0bf8472f81db8d3e521f6c33dc0a18f6
Merge: 8c587ec fa71a5a
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 21:11:29 2010 -0500

    Merge from trunk

commit e66391beb3f2408025ba10843b2caa93cb6bed62
Merge: fa71a5a e81837a
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 fa71a5ae68952b2277e4f596cff4981b96e847b3
Merge: 9866e73 93d144b
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 9866e73e09c0bbc4834aefb7a080e942661b90e2
Merge: 3052d99 13bacfc
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 3052d998cd828a61730549fe5b2f3a542860713f
Merge: 8c587ec d22b1c1
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 92656cfe8293385d0644959e535cf1f8fd201a66
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 18:47:47 2010 -0700

    fix security group revoke

commit d22b1c103a08e52ee29c0ac6864497100811ade1
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 18:43:36 2010 -0700

    Fixed tests

commit 7a3ead9a3933bcb23fec063261ed5a837447ba30
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 18:38:19 2010 -0700

    Removed str_id from FixedIp references

commit cc107a01ef23a0552ce4f797b8b5121a69fed448
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:53:27 2010 -0700

    missed a comma

commit a07e0890df085b80e10262648a95cb17d3882387
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:41:57 2010 -0700

    improved commenting

commit ecefc7a6dd15ab7a20147fc701673e0b2b34b2b7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 28 20:36:50 2010 -0400

    Fault support

commit 07ac2d24da15c254c364a6a2d89041a4ac405674
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:24:25 2010 -0700

    fix flag defaults

commit 6153da626c193b31b91928ec0db1b34828732d0a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:15:59 2010 -0700

    typo s/boo/bool

commit ae08bd2c5912d6bcb2fe1fe3467b39c9f4b52a3b
Merge: 7b1bc9c 3ca6593
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 17:08:56 2010 -0700

    merged and removed duplicated methods

commit c363dbfe1e30780e17cfacb24fe8d3f27f946628
Merge: 9c6cb19 d09cbbe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 16:54:57 2010 -0700

    fixed merge conflicts

commit e81837a6e3d00cdb331ac2dbc4a2760b2aa35e08
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

commit 21f03d9b692de81232d3bf89e709e0a51e49f95f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 16:10:47 2010 -0700

    Fixed name property on instance model

commit 8c587ec37f68598f210b185d5f8029744196c718
Merge: 1880580 fee891c
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 8bd9ec6c4da69425cee699433f5fb211796da503
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 15:15:05 2010 -0700

    Added checks for uniqueness for ec2 id

commit cb9b69034decdc209f14fb6154230b6331a5d3ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 14:59:32 2010 -0700

    fix test for editable image

commit fee891ccfbe0827ceb40f5e5f7c997d3957247a4
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 16:46:21 2010 -0500

    Merge prop fixes and pylint/pep8 cleanup

 pylintrc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 4e88b35fd21dad45d279dc0d89e7c65a552c1648
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 16:47:29 2010 -0400

    Add authorization info for cloud endpoints.

commit 7f3f67ee3eaed90409adb99cac68f8d96abdca95
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.

commit 04bb1030d6cce4e0b38d3b92d59a16ab160bfddc
Merge: d5dd4ce 1880580
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 16:39:52 2010 -0400

    Merge trunk.

commit 93d144b9b8969c6f721d77311595afec892d65cf
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

commit e09d1943d05fc302fc6270cb68a50682ba9edf9e
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.

commit 188058025490cea4e62b4473b59f4f78ec6150b7
Merge: 4a466ff 0528fa4
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 28 19:53:21 2010 +0000

    Refactored adminclient to support multiple regions

commit 55b2f4d735ffeb060699440d80bcbbff05ac7280
Merge: a34b3b5 7b1bc9c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:31:35 2010 -0700

    merged network-lease-fix

commit 7b1bc9ce29378e4d066499015808a4a7c3040d30
Merge: f172a86 9c6cb19
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:29:43 2010 -0700

    merged floating-ips

commit 3b17431a89982184199eef38220b5336aa01d858
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 12:09:17 2010 -0700

    move default group creation to api

commit 0ac4e930dc9b18ad203cddd25f1ccbdadfd03f61
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

commit e3a5f0273ecd99f53b99fafacd7c4f9829ce93f6
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 files changed, 13 insertions(+), 12 deletions(-)

commit 6cfdfe1641df052e0738f7ca455403489c51c42e
Merge: 627187e 4a466ff
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 13:13:36 2010 -0500

    merge from trunk

commit d5dd4ce317e4ec0cbca1ee9d2bab668b7f6448d2
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 28 14:09:53 2010 -0400

    Instance & Image renaming fixes.

commit 627187e058c6a16432dd6cd1a7dd2322ca5d44ea
Merge: cfda28e 829ae5b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 13:09:25 2010 -0500

    merge from gundlach

commit cfda28ed2d4402d5ba7bc479a73f372131ba2a0f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 28 12:56:01 2010 -0500

    Testing testing testing

commit a34b3b533b71ed2ff11515eb2574aabcd1dff614
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

commit 829ae5ba8924302333115f8e5e0d6f32e2c1f1c9
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 28 12:54:17 2010 -0400

    Add Serializer.deserialize(xml_or_json_string)

commit 36bdbf9bcc1a17641f817b4abf78a9aa31c8304e
Merge: e6e73d6 8a39f0b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:39:18 2010 -0700

    merged trunk

commit e6e73d6be489077c2380b7104312ac2c9b24c08a
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

commit d848a87ad198324ed5bdfb47bb8d3224330af629
Merge: 611099d 9c6cb19
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:28:39 2010 -0700

    merged floating-ip-by-project

commit 611099d40a6db3e8bd4eba9d0fa900c417230e9e
Merge: 8a39f0b f172a86
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:26:36 2010 -0700

    merged network-lease-fix

commit 9c6cb19be8737864105d8f59b95839baf3b9e12b
Merge: c5d973a 8a39f0b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 28 09:22:36 2010 -0700

    merged trunk

commit 4a466ff6515acbf90500d4c66ac39b9ce16fd2e0
Merge: 8a39f0b 71e2d4e
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 2f8fce81311097756d89c54db5f37243141ee4a3
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.

commit c01f38b19748ea555082436a3a820fd35475bf4a
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.

commit 509f58b96e94a435bcb45f2b4e91c62ec6e80e42
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.

commit a21255ec14225131b7d28c39343fd72705093918
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.

commit 4a8f5adcaa7c42cc6626ddede73f046cf0896461
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.

commit 46680a485e48dbcfda8b0c874fa529a5495fb429
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

commit f00d1417dce844139a9846ba8abcb9f99bf73823
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

commit a1ea492c0817ed6d8c1d0f1d63ff7ec8f45f97ed
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 28 00:21:36 2010 +0200

    This is getting ridiculous.

commit fc632f24654f9bb68389024cc2e02a62dbecdcb7
Merge: 6cad51d d4f7703
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 17:01:59 2010 -0500

    Merge from lp:~gundlach/nova/servers_api

commit 6cad51d10971312ebf40ae53909317b1b6a6ea45
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 17:01:37 2010 -0500

    Power state mapping

commit 8981f789680db0640b52a527c232d800a156084f
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.

commit 364cdd81b3fa8a479b388977c628bdb5eebc006b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 21:57:13 2010 +0200

    Recreate ensure_security_group_filter. Needed for refresh.

commit 6b7da1892c9f722828b1efce9392131be97cfd47
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.

commit f8684093f561f75d00dfdaec77fcf021b41db8df
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

commit d4f7703b2817151455987bce536388d1036a61fe
Merge: ea10496 845cb79
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 14:18:47 2010 -0400

    Merge from upstream

commit 845cb79ad228973f995b7c8b0ba64d9fb59f670f
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 27 12:58:35 2010 -0500

    More re-work around the ORM changes and testing

commit ea10496a2c0b36323f522fc51d52f0a0191ceedc
Merge: 3245e67 c962302
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 13:27:01 2010 -0400

    Merge from upstream

commit 3245e674c0d776498961fd9554145a6322d814a6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 27 12:50:20 2010 -0400

    Support content type detection in serializer

commit 78a9af8b0a518e5fcecadac3b417f9895c6ca565
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.

commit 0f3cdf5a184899d06ee9ab84b502411c71d48959
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.

commit 2a5ae473652ed50a3e7b03476dd021ec9639988c
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.

commit 762e5f1d379453a440702be51347b581246d52af
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.

commit 32dce48366034ad68e18263cf2a181a78da48c68
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 27 12:14:20 2010 +0200

    Ensure dnsmasq can read updates to dnsmasq conffile.

commit 469b9d56d45380b29e0050c6cc746c6330de5d74
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.

commit 36a0a22ba97ae4954b9d7ffd6bd8dabdcc82bcc7
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.

commit a7c15d60411392bb031e3a91b7f5d1ea9a6a39ba
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.

commit 0528fa4b7dbb85e35618c6065dd82d90b3fbe38c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sun Sep 26 14:45:27 2010 -0700

    Removed extra logging from debugging

commit 87d12f4149337526ca7285b48e781d8467230719
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

commit 687b70b5e1f97ba13910c7517129881ae3ccf909
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 13:53:29 2010 -0700

    allow in and out for network and compute hosts

commit 9451d6f52e1f1ec7217778c5864b7d572dc58b58
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

commit ab438382554bf2ef767a6cc5791d2198d86f38e3
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

commit 3d10e013b4a438844c39475f2348ff08d4d1d599
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

commit c321f47e206161da03a29937ea727ecef8958c41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 09:28:05 2010 -0700

    add forwarding ACCEPT for outgoing packets on compute host

commit 7f98573230e19beaba6e8fd6235ad164d978128a
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

commit 4f66a6cef7f29988878a6541c1a7741564b6d89b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 02:51:50 2010 -0700

    allow mgmt ip access to api

commit 4babe63a730052761596244eefa85d9dc35636c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 25 01:05:39 2010 -0700

    flush the nova chains

commit 25eaeead74573551c37dafedfb47f46d43e00d5d
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.

commit e2770f0581dc6cb7561b75c0bb72a82264a6d05c
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.

commit df35a56a42f61ee1e0d2913d9460b9cc0ce6e550
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 24 19:57:41 2010 -0700

    add a reset command

commit 67a6b6ccd13470f4004a30c2e6bb76f75288265b
Merge: 8a39f0b 47f6071
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 66939194c7756615800f9288f641a09f9474d6e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 24 18:21:58 2010 -0700

    improved the shell script for iptables

commit 3b000789e65cfbaed0b94b694ca79daf90949f47
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 24 17:42:55 2010 -0700

    Finished making admin client work for multi-region

commit e82114ac0b0e8d4b04ffab444da7be71d5d2730e
Merge: 75e30dd 8a39f0b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 24 10:25:29 2010 +0200

    Merge trunk

commit 71e2d4e0231da13a946c8157013bf69957af00de
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Sep 24 10:21:10 2010 +0200

    Install nova-scheduler.

 setup.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e04a3ff8d467646df6925681ac271cef963f7b70
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 files changed, 0 insertions(+), 1 deletions(-)

commit 3319b6f28e671857377c96d6fd550f09ae66cb6d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 23 18:00:27 2010 -0700

    Add multi region support for adminclient

commit c9623028ee00c1e3750b909f06273d6de08657ce
Merge: 1cbc3ea 1f6c4e2
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 1f6c4e2000301d19f1145c8bd7ec12e06208b654
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 23 16:45:30 2010 -0500

    whatever

commit 1cbc3eae00875d7965febce270fc32d313928802
Merge: c5d2112 8a39f0b
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Sep 23 16:42:39 2010 -0500

    Merge from trunk

commit 8a39f0ba909fbf15ade329c7f7910ebbcfcd9357
Merge: 18b5bdf 77a6876
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 77a6876ba84b5a437e06700c884b8f692c0339a9
Merge: 337e48e 420791d
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 420791d212b7901319dc4685026e7a08cc9c9ac0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 17:06:23 2010 -0400

    Apply vish's patch

commit 337e48e5c13a4a5a5898959b952f7006504efdf1
Merge: 1e6bfac ca7ed09
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 16:21:02 2010 -0400

    Merge lp:~eday/nova/endpoint-cleanup

commit ca7ed09e416b6cbd54c333dd9bddd80884fe5082
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 13:18:40 2010 -0700

    Applied vish's fixes.

commit 18b5bdfa30fbd829a40d1e749db52dd0cc25de4d
Merge: 009199e a166fa9
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 0bb04ff681014c8d8024aa87b5f0fb935129a4a0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 12:43:41 2010 -0700

    fixed a few missing params from iptables rules

commit a166fa9d355dcba747f674434a50e1de603a67a4
Merge: 544f00f 3a13ea3
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 19:31:17 2010 +0000

    Merge fix from Soren

commit a29eb870f32e55ff6b52b4338b2bc02bf4c9b193
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 12:20:40 2010 -0700

    removed extra line in manage

commit 29a8425c8d3f4c1ff9405bd5d164c1b72c0e4322
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

commit b5fd5e7ce2437e3cb9acb70654d9593b38110d2e
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 -----------------------------------------------------
 1 files changed, 0 insertions(+), 94 deletions(-)

commit 9f9f8ad14585448a585d1687240aa04bb9ec05db
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.

commit 541f7bf12969f37509559788f0c41a9a811c668d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:40:09 2010 -0700

    fixed a couple of typos

commit 544f00f3d8f1812549c158bccc9a48d9d5aa232d
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:29:40 2010 +0000

     Re-added the ramdisk line I accidentally removed

commit 6cb07d0ef2c18996151fbb63ec633dc55044dc65
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

commit 2ff7ddb9ba86f44a3574ce4bff88effbef259d08
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

commit c396ea5df7b4ec187e995cd6185cf747bce5edf5
Merge: 2b0b402 0b4c2fe
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:28:15 2010 +0000

    Some more refactoring and another unit test

commit 2b0b4027e10b74312c479c44aec61a21161fdb15
Merge: b9b976f 687b258
Author: mdietz <matt.dietz@rackspace.com>
Date:   Thu Sep 23 18:27:56 2010 +0000

     Refactored the auth branch based on review feedback

commit b9b976fdef170691d4bcdf6bf63fbe17600960d8
Merge: fadeb71 cf03db0
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 b9472684e74e249417f42d0fd04a4ebbd30fb2d9
Merge: a394745 1e6bfac
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 11:24:26 2010 -0700

    Merged gundlach's branch.

commit b6303446fd2cd34b17813c7e4b97badacefd9c38
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 2d485b61a3816668be8d1badac32758d576fd9af
Merge: 514e2f4 0ff5002
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:22:44 2010 -0700

    merged trunk

commit a3947456c8eac5838369d33655949b86ac5d4da6
Author: Eric Day <eday@oddments.org>
Date:   Thu Sep 23 11:21:14 2010 -0700

    Fixed cloudpipe lib init.

commit 0ff5002ba2e76564067ede60cc5eced6d2f552d9
Merge: 8a39f0b 514e2f4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 23 11:20:25 2010 -0700

    merged fix-iptables

commit 009199ecac31ee4b999e51a97ec25924e733d8e5
Merge: 7fa84e7 3dd6c15
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 1e6bfac9255ae2e98dc7029224a79e03e856b596
Merge: e0516de 275f8df
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:45:21 2010 -0400

    Merge lp:~gundlach/nova/rbac_tests_rewrite

commit e0516de3407b4cced47fcc0905aa10c12d4cdfb4
Merge: e8e0244 18b74b2
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 e8e0244c11f8fb2865f7014f59557539605c37d3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 10:19:27 2010 -0400

    Spot-fix endpoint reference

commit 85ff51708ce4ec6ae03d34dbf50bf7768a67acce
Merge: dba938a 8e609e1
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 8e609e167fcc4310e1f496e2261fc4f49271609f
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.

commit dba938abb701333367df7b7c0556bd558da5d72e
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 23 09:13:27 2010 -0400

    Apply vish's patch

commit 18b74b2af47144b0a4530a3f977a9d53d60edb5a
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.

commit 75e30dd4cd8da820119802e63d95850a7f0f7b04
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 23 13:59:33 2010 +0200

    Address Vishy's comments.

commit 3dd6c150b26d0065b598e4fefb71b2347184b12a
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.

commit 3a13ea3c896328a2e9dc9026d0d5b1a62f669985
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''.

commit af2cb48599678ed82b270a483bfea2e44a8a6d3a
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.

commit 9033596ca8b08248fc4e0b32a74e5e0d7ab21a9a
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

commit 5e197781ee1dd8ece8cf9b7478b97cdc32b7c6b7
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Sep 22 21:57:34 2010 +0000

    Re-added the ramdisk line I accidentally removed

commit 068d2146b12ca0dc1cec86da2cc35a3c07fa3ec2
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 22 17:35:02 2010 -0400

    Soren's patch to fix part of ec2

commit cdad83f439083053b4c44531f679c7cc7d4aaed5
Merge: 88ceef2 7fa84e7
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 22 17:04:25 2010 -0400

    Merge nova/trunk.

commit 88ceef2407813d4306e587e6760bacefc840ce16
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Sep 22 16:42:35 2010 -0400

    Add user display fields to instances & volumes.

commit 9a8aad0cb5e04d90c282d34229bb1be0b14b2834
Merge: bec3fd4 357a819
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 22:16:12 2010 +0200

    Merge lp:~anso/nova/ec2-security-groups

commit 275f8df9f5f7820feddf10a7fb74d0d74d844ed8
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

commit bec3fd4132de2eaad901868cd0baee1ec9274f67
Merge: 73c7519 fadeb71
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 21:36:15 2010 +0200

    Merge trunk.

commit 3937e4f960b33db2b854912b3a8e689dd332d475
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

commit c6fe28b38646d556c27dc8153214f53f3524c0b1
Merge: 455989e fadeb71
Author: mdietz <matt.dietz@rackspace.com>
Date:   Wed Sep 22 18:33:05 2010 +0000

    merge from trunk

commit 73c7519a878a1a00b2eadde3a4868333886bf681
Merge: 2d082b0 44d4ebe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 22 13:26:36 2010 +0200

    Merge trunk

commit 357a819cae118e1a7dcded863ec4495fad5f4948
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 16:43:32 2010 -0700

    typo in instance_get

commit 4f78ff3e64b629b73d31f33eb5563eeb2575d14c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 16:32:07 2010 -0700

    typo in instance_get

commit 45c59304691e75ae7fd860be935c439286a45cf6
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Sep 21 19:24:19 2010 -0400

    User updatable name & description for images.

commit ac9fa0c592423530665c3a62935fafd159a5d8dc
Merge: 65e575c fadeb71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 15:57:03 2010 -0700

    merged trunk and fixed errors

commit f172a8620302ac8ca4560faa9afe01bc4f9ad659
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 15:44:49 2010 -0700

    cleaned up exception handling for fixed_ip_get

commit c5d211237c5b4c5d565eda7001493c204bb90806
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 17:12:53 2010 -0500

    Added server index and detail differentiation

commit 4551b3c379c8772881e4ee895fe7f21b6ac43c88
Merge: 3e9d1cd fadeb71
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 14:57:37 2010 -0700

    merged trunk

commit ce1f0a633c0b2790c04e032cd5ed6ae0f9979787
Merge: a852664 7fa84e7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 16:45:44 2010 -0500

    Merge from trunk

commit 13bacfc99d9bbf84c314e47a30fb65df3e270174
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 14:36:06 2010 -0700

    typo s/an/a

commit adf16668606da767b09f6743fcf5a4142b409a60
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 files changed, 1 insertions(+), 2 deletions(-)

commit 03cb2dd7f142daa6fc08a116893eb1036b446fd3
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 16:57:08 2010 -0400

    Rewrite rbac tests to use Authorizer middleware

commit 455989e745d367cef16e75ef5805e03aaafe3273
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

commit fadeb71775c66aadf57e880186fc0878104568ab
Merge: 7fa84e7 462ae83
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 462ae8369c4ff0a788e4e82eceee83b63e57681f
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

commit 6dd88860df836da984bdbd3134655b3f12fbf50b
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.

commit 76b904e88f4dacaa3aeffbb489dca4f07d216832
Merge: f7c9a63 7fa84e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 11:12:34 2010 -0700

    merged trunk

commit f7c9a63136e7b810366e8dcbfd2d787ca5929712
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 11:12:04 2010 -0700

    bpython is amazing

commit 7fd2afe87e15b92b1a7e2f1d71ef4b62158c6c49
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

 run_tests.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 87d6e9d1c875f83ca265363e47ebcbfdbf7cfb25
Merge: 0b4c2fe 7fa84e7
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 11:02:33 2010 -0500

    Merge from trunk and resolving merge conflicts

commit 6bffe3d25e4b661d66573809285c8348c8c9d4d4
Merge: 4393da1 7fa84e7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 21 12:00:44 2010 -0400

    Merge from trunk

commit f92349bbb4d1a9ba20353b4de9b5dbe13687a280
Merge: 3a744b7 7fa84e7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 21 08:30:53 2010 -0700

    merged trunk

commit 0b4c2fef5a77f0485f076757bca87a8e5b953e55
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Tue Sep 21 10:07:59 2010 -0500

    Some more refactoring and another unit test

commit 7fa84e7d7cd89a0ad0724fdcb44936165e969120
Merge: 44d4ebe abc7862
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 514e2f4b432e9361f05be93c958bd785146ef6ed
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Sep 21 00:03:53 2010 -0700

    Renamed cc_ip flag to cc_host

commit 44d4ebe28b34725c47a7198138842143d0d3fd09
Merge: f936a27 e8fe9e3
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 f936a278b5f45155cea3b0e6092c9a3097031890
Merge: 39f282b d0d49b7
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 39f282b7b594f697e20c1f5d3025da4db9964164
Merge: 5746000 3de28ca
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 3de28cacba03aedc66535d841e88b2b28797d696
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 =.

commit 5746000868e14e5148d6c9b781f74fe44a37fcc4
Merge: e838da1 27352a4
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 abc7862fb0dce7b3e744a3543ea2060c20874850
Merge: b8c0898 e838da1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 19:19:28 2010 -0700

    merged trunk

commit e8fe9e3ac7beb88fbc9f20535002b8701040cb4e
Merge: 3af6559 e838da1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 20 19:17:36 2010 -0700

    merged trunk

commit 687b258feeb899f4cdbc5eda29fd955174b4ccd8
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Sep 20 18:04:57 2010 -0500

    Refactored the auth branch based on review feedback

commit 015bd214d7d27d307bdc5ba83c896e9ce879fb46
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Sep 20 15:35:44 2010 -0700

    Whitespace fixes

commit 4393da10052ee45ba036a25d25f40db82a7c8b28
Merge: f5be5b7 e838da1
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 18:30:35 2010 -0400

    Merge from trunk

commit e838da14117089b3ee899f71dff9e6c26048feeb
Merge: a0734ec d18b37b
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 d18b37b8329e156b8573edc6c1bc8a6e4eb6f23a
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 files changed, 1 insertions(+), 3 deletions(-)

commit f5be5b73d14a1555e3a8b9b9a11c06a8fc5ab758
Merge: ffc27ce cd90bde
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 15:36:45 2010 -0400

    Merge from trunk

commit a0734ec0a66e88d7344d5d85c38dfb95db03fdec
Merge: cd90bde 4f5e759
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 4f5e759d60f4bea5708fe430b21bab40f49caaad
Merge: 28e489c 5eb8661
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 5eb8661c1214ed8801d74c386327f8ac63b1d8cd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 20 14:49:05 2010 -0400

    Use assertRaises

commit cd90bde67fdf4aa7bb3789d50ca183ab21fe073a
Merge: 12c05fc a0437f0
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 12c05fc9410cd5df59d5ef197aa5a10c729123ac
Merge: 1d070d7 d371410
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 1d070d74129b2d7b97c1147cc4af17b9ff9451c4
Merge: da99c06 3912e8e
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 3a423f730b8bf35abffdb2548b48a38cdf6dc3f6
Merge: 5c84882 da99c06
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 20 12:43:50 2010 +0200

    Merge trunk

commit 5c84882122711151252b8eb3b56523e3e54de847
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.

commit bd017382a70be1aa643e3e9c996c8f1c63b96ead
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.

commit 9dd014cf7684d6246c5111944d69bd3ac8b88dd0
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

commit da99c063294909f545f3013033c8e8b651ff292c
Merge: e65208d 0daae50
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 e65208d4a78ba751281cbebc308a6c30cbe78be1
Merge: b88ca1b e2b058f
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 b88ca1babc5a3952ceee0e4f98c023e06eb45b22
Merge: 8beff6f 118e53c
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 4502344f1ebf5bcbb187d0f23ad7a081dea956d1
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Sep 19 18:23:41 2010 -0700

    updated docstring

commit df84577976061ad1352861edb22e3497de233b3a
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 20:36:13 2010 -0700

    add in a few comments

commit d0f7e730f074f5940743b60f71797dc5fa123ddd
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 20:02:36 2010 -0700

    s/\t/    /g, and add some comments

commit 0c725f5b136d6e51126d3a4ab03fc7d26049017b
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:28:10 2010 -0700

    add in support for ajaxterm console access

commit b2e15d96601c1cc99642c48c51e7a2765135a974
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:10:08 2010 -0700

    add security and session timeout to ajaxterm

commit 1f9028e81a9a9501147e0fa0c045f89e7dd3feb2
Author: root <sleepsonthefloor@gmail.com>
Date:   Fri Sep 17 19:08:22 2010 -0700

    initial commit of ajaxterm

commit cf03db0e7b10b3c4c5d7ed51531d3d6b89848aa6
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.

commit 77a7728089c711cef5201e6c21b41003f81d0df5
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 16 11:44:51 2010 -0700

    Whitespace fixes

commit b3f86d27d3956d580b5b478629e866f0cdb1e0dd
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Sep 16 11:40:04 2010 -0700

    Added missing masquerade rules

commit ffc27cec95ad8f5e3d2e86f654fc48730f42a338
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

commit 8beff6f3f11a46f5223ee69c9f89cdf20b95a97f
Merge: 6220f80 e177b14
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 9cb524297108cfcdf0992ef6196c68423700d7d4
Merge: a0f6187 6220f80
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 16 11:33:42 2010 -0400

    Merge from trunk (pulling in orm_deux)

commit 98c5506026fb9716ba180ccb95bf939d30ae1564
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 15 17:49:15 2010 -0700

    Added iptables host initial configuration

commit b052906f02be8249497708d344c97d4ed609ac12
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Sep 15 17:40:12 2010 -0700

    Added iptables host initial configuration

 tools/setup_ipchains.sh |   94 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+), 0 deletions(-)

commit 6220f805ba355925c79761dbb2b0f2fbdfcdb519
Merge: 0423f96 365a4de
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 8b22b8a900ea169407788442064336f321a8761d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 17:17:20 2010 -0400

    Support querying version list

 run_tests.py       |    4 +++-
 tools/pip-requires |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

commit 28e489c2ec126fd3aedc63d2a71faf66a6f080fd
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.

commit 0e88edde8eeb383c4862954c79913fd2e93a6c16
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 11:23:08 2010 -0400

    Test the WSGIApp

commit a0f6187d3c04efc710b87d4962aee5b765f7ce22
Merge: d86501d 0423f96
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 09:31:23 2010 -0400

    Merge from trunk

commit 057cbd35b2db2e237900a226e47d60991a5576b4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 15 09:25:53 2010 -0400

    RateLimitingMiddleware tests

commit 2d082b0e30321dfa423d5441d81c612b793cac86
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.

commit 65e575c5e58ba4c7b289c38718ff77153d76d4f9
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.

commit 55377c03c01bf2d7a2b909e865e8c87f198e38a1
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.

commit 5b08760fdcbd64e2da49bcb5366c451c2cdf7343
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 15 12:05:37 2010 +0200

    More ORM object cleanup.

commit 34f48e81eef7ee02781ca6912967d04b6869d46b
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.

commit 00a3a74451603f4344cbf6911f552631152a66b4
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 14 18:59:02 2010 -0400

    RateLimitingMiddleware

commit 8fb1025787998675b4417494d2e9e51017e8be9f
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.

commit 0423f9638d7246305e48e6513cceb62169fa92c8
Merge: 92804a2 87d4c63
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 79cd05a97dc92915a0577163588e8ab945378df6
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.

commit 9bc8731d34bbf5848d09f0a934092f95dd15c3ee
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:23:29 2010 +0200

    Network model has network_str attribute.

commit 40da29d1f26936359c6650bd01988e9654283ccc
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.

commit 03b6d11e2068df331b8777dbf9a5df4651d4ce49
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 15:20:08 2010 +0200

    Make refresh_security_groups play well with inlineCallbacks.

commit 877ad14e138e4ccf585de74edb94ecdcac12a1c1
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.

commit 143477487a4ec0f6a64447909b3ffaa44d48a36e
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.

commit c0f098640acfa97cabe26f57fcc259c9132873a2
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Sep 14 13:01:57 2010 +0200

    Multiple security group support.

commit 92804a23d1d64cd25d2b356e27f297ec44375a4f
Merge: d5cf02e 00ada8c
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 4e7eb9494e11cdc81e34817cba4cb52047a57e71
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Mon Sep 13 23:56:32 2010 -0700

    now we can run files - thanks vish

commit d5cf02eb03fe381e2107db07ed673f97326094b5
Merge: 62e0489 bd7cb02
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 62e04894f944a926aa61587ff566c4428fe67a26
Merge: b7e2594 67c04d6
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 d86501de97ba22b067d51f350d8bf563f4686d1f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 13 12:02:50 2010 -0400

    Finish pulling S3ImageService out of this mergeprop

commit a42d97f5b2ea8dc0b50ebe94954b1da9deefa384
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Sep 13 11:53:53 2010 -0400

    Pull S3ImageService out of this mergeprop

commit 2e43e43c4ec230e34610f37f7b43ce54e487119e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 14:20:32 2010 +0200

    Correctly pass ip_address to templates.

commit e602faeedc1c086a11793e5788e59b2b0e5123ab
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 14:18:08 2010 +0200

    Fix call to listNWFilters

commit b57bb05b6af7e890713fbcf3742745541ab1e903
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.

commit f5257858640b2b23eb1e9ff12c2b27c2b8a84707
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 11:45:28 2010 +0200

    Filters all get defined when running an instance.

commit 3912e8ebf689df042c85ebb94f7cbb0d4f22c5fb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 13 02:15:02 2010 -0700

    added missing yield in detach_volume

commit 2c0dfa2ac765f58905c862ddd8cb1d3772c10d21
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Sep 13 01:58:40 2010 -0700

    multiple network controllers will not create duplicate indexes

commit b8c0898e27ada7a838a4ee4e101262abfd902b8b
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

commit 437bf425636dfc7437173c91b3e8a05ec4e36d04
Merge: dfba82f 24c5d82
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 09:32:36 2010 +0200

    Merge nwfilter branch.

commit 67c04d640d20b81c9147c6ee1dc68acc5cea1cb4
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)

commit dfba82fe2a7cca823d23622e1e5e58d70a6758cc
Merge: 06dcd7d 2881631
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Sep 13 09:06:14 2010 +0200

    Merge Devin's security groups branch.

commit bd7cb0286347898f7b4215c31fe3773285fc95ee
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.

commit d3714103fdcb6654e15703ba5eaa49cbc16d7bf5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 23:09:15 2010 -0700

    removed second copy of ProcessExecutionError

commit 3e9d1cdb5a8fcbdf5c466f63a42c85d6cb7ebcea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 22:12:24 2010 -0700

    move the warnings about leasing ips

commit 44cc073e41b7041c18cbb9a29e521327408971a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:25:15 2010 -0700

    simplified query

commit b8365cb48b5343af08b7f816a8cc2367bde988f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:16:52 2010 -0700

    missed a space

commit 2f888c5293be54ff6d5c21921e26c3bba9dd42bd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 18:06:59 2010 -0700

    set leased = 0 as well on disassociate update

commit 9a8abc045ef989104c54f28cb5c2d75bd3073e4f
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

commit f5746ac59b697acae29f52775cc9cd16dd728891
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 17:24:06 2010 -0700

    workaround for mysql select in update

commit 9a8cea6f72427c7b0f5fc2ce42fa5a45d84e7453
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

commit 3a744b70b39d39d55b42539c479501ef97af14ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 08:16:59 2010 -0700

    fixed typo

commit 3dcf11de5dcd6955d573277f268f8bbd2bdf947c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 08:06:44 2010 -0700

    flag for retries on volume commands

commit 1172f3bbfbb67734cacbeb4c6090987013daa06c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:37:03 2010 -0700

    auto all and start all exceptions should be ignored

commit 7526762bb7fdd792ac5a07f8f22752f31e6d7add
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:24:31 2010 -0700

    generalized retry into try_execute

commit 2f84d051eb10efe6fb25ecc2eff973c5c5bb3ce0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 07:04:36 2010 -0700

    more error handling in volume driver code

commit 29c490ae29b48a1cd784f67f72900d7f77e84be0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:37:08 2010 -0700

    handle exceptions thrown by vblade stop and vblade destroy

commit 0daae503a186f69768291862542fb5e5cb540264
Merge: 118e53c 8beff6f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:20:11 2010 -0700

    merged trunk

commit d874117ddec7b3a1bc9e8141867c115689a70145
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 06:05:17 2010 -0700

    deleting is set by cloud

commit 7be1530acd4a4ae4e394908c64f8a4df4f33f7b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 05:46:13 2010 -0700

    re added missing volume update

commit d56d767b52eacae9fe069de2668e2bb2cd4ae6fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 05:31:27 2010 -0700

    Integrity error is in a different exc file

commit 3faa296f69243b324c8daaed64a19406b6dd4e72
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

commit 379c10f3a435497664080e32089c82bd2763d74b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 04:48:49 2010 -0700

    fixed name for unique constraint

commit cf803bfcbd21c47c38d39a14dcc1a7fab62d31df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 04:44:57 2010 -0700

    export devices unique

commit a1f636fc27ae0db5b161dad2f1796d3db45afe2f
Merge: 8beff6f 118e53c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Sep 12 03:58:03 2010 -0700

    merged instance time and added better concurrency

commit c5d973a729d679405293e5e121773ea6cf1c794c
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

commit c5818badbc36dc0b34aa306572bda84d2e909c9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 23:34:32 2010 -0700

    disassociate floating is supposed to take floating_address

commit c59d670454a6b9707a4f10e56be9b9dcf723cc07
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

commit 398a18ad5066e0c8e71a3e1a80f293208662e750
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 22:54:47 2010 -0700

    don't allocate the same floating ip multiple times

commit 118e53c415b7b3dbdec4eda452468a24e59e0f55
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

commit 3dc9d3bd1247bbf92db607391e430a0e7663cc82
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 21:12:01 2010 -0700

    fixed reference to misnamed method

commit 5dcbe806bc6e0eb6ba8f0a12d9169cac87d9cd56
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:54:12 2010 -0700

    manage command for project quotas

commit 17b376f283d6938ad32cef7934392bcedaf0c331
Merge: 1e4444d 8beff6f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:33:13 2010 -0700

    merged trunk

commit 89b5bd07d91a744e6ed1da7585130a50f516afad
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

commit d3a919531372fc6ee2f6a04adc2e2704b645614e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:05:32 2010 -0700

    fixed reversed args in nova-manage project environment

commit 92030f5b57745f1f526e0f5e71224eb1d18fe792
Merge: 4c681f6 020b8e5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:00:56 2010 -0700

    merged scheduler

commit 4c681f6703e84b73098076c0afe1a1ac9af4565f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 20:00:02 2010 -0700

    fix instance time

commit 020b8e55a23a2cc35575a5accbfbe2066ba09b99
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 19:43:02 2010 -0700

    move volume to the scheduler

commit 446c43d5e061481fe2724f3f2dd3ca4b04604be7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 19:40:38 2010 -0700

    tests for volumes work

commit 6d147c93e7b49713e0438b44edbc5ef135ce7c96
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:57:15 2010 -0700

    update query and test

commit f132ccdb08be8a3a4ddc3eb5b0f548e5656a77e3
Merge: 27d146c 1e4444d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:45:35 2010 -0700

    merged quotas

commit 27d146c0d03e810a7be54c948e9a87dc9d2724ba
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 18:45:15 2010 -0700

    use gigabytes and cores

commit d0d49b7607eaaa657733430a4d1e33373a6f8956
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

commit cde1e967fd5b0b4e2a358a96c0dc160e2150112c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 17:12:43 2010 -0700

    db not self.db

commit 2881631c7430e94821065aa4d56f0213c775a610
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Sep 11 11:19:22 2010 -0700

    Security Group API layer cleanup

commit 1e4444dd9e8b3fd29b4be2ca4761cd0ebd4edd60
Merge: 3847c35 6220f80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:46:35 2010 -0700

    merged trunk

commit 32543449c9e653bc59be16f5649abd1062008a30
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

commit d0a629eb208d0d1599928703205e387405eff860
Merge: fe93b68 f8288aa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:31:16 2010 -0700

    remerged scheduler

commit ffca085abd927d7e826b9877df8457589157ecff
Merge: 534e3a7 6220f80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:27:43 2010 -0700

    merged trunk

commit f8288aa16536b6f73505242ff38d0deac88e8d26
Merge: 57d0ed6 6220f80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:24:19 2010 -0700

    merged trunk

commit 3af6559a68c26f76f96305ec76f959d900eb0c4f
Merge: 55f05c1 6220f80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:23:23 2010 -0700

    merged trunk

commit e177b144aa29ad434a7315f3af8105631c1c9fbe
Merge: e39d6c6 6220f80
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 08:16:16 2010 -0700

    merged trunk

commit e2b058f3723b64b5e7ec8573aff5a54c210bc7b7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 06:29:13 2010 -0700

    fixed reversed admin logic on describe instances

commit 63217cb9fc49d02ab68dbbce2237ffd141284251
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:48:37 2010 -0700

    fixed typo network => network_manager in cloud.py

commit 55f05c168529e8c40a1f1216691fa528544feaf7
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

commit 365a4dee7c958e3bd392a4a13497de8030bd5bc0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 04:06:22 2010 -0700

    typo fixes, add flag to nova-dhcpbridge

commit 6cef872e1aa3b0fea3bd05d6a19d680735ba5f7b
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

commit 64ab9825d3b9ba9c394cf07812add26f7d2367b4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 03:31:40 2010 -0700

    simplified network instance association

commit 7f0e109c7e4f4b5388d93bb0f99cab5719b21f79
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 03:06:27 2010 -0700

    fix network association issue

commit 492aa8bea8c17b54a9d05cfe76f2311b942dfdc3
Merge: e190fc7 0423f96
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 00:21:58 2010 -0700

    merged trunk

commit e190fc79bac4ab27b1404304021921d9950947d5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 11 00:16:12 2010 -0700

    improved network error case handling for fixed ips

commit 534e3a7f424f6df321d1f17db1e9e3efd2349063
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

commit d22ebbe532b026ed3b753d20154f750cd72fa38d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 22:13:36 2010 -0700

    move keypair generation out of auth and fix tests

commit 8307776f13e62cd554a812c3712d48cd7fd3c4bf
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Sep 11 02:35:25 2010 +0000

    Fixed manager_user reference in create_project

commit f16ceaef989d2572f1ac53849761c294b6e16755
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 10 19:19:08 2010 -0700

    Finished security group / project refactor

commit 0109df1e9fa412b4c23a8cb13dc458afb557deec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 19:03:35 2010 -0700

    delete keypairs when a user is deleted

commit a09489354556184e0098a6f05a0333c8e88b8eec
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 18:55:11 2010 -0700

    remove keypair from driver

commit 160f17fc7bc53c1b96846bec3e39d2364afb23a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 18:51:22 2010 -0700

    moved keypairs to db using the same interface

commit 20618e2c7e6cbf775e353d54fe8a4c7fe194a663
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 17:12:49 2010 -0700

    multi-region flag for describe regions

commit 3847c35301b12777494f83ddc412f03a36204967
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 16:40:49 2010 -0700

    make api error messages more readable

commit 7218a3c93e2d2624f4afff9ae1f898f9d646bbfe
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Sep 10 15:26:13 2010 -0700

    Refactored to security group api to support projects

commit ebca3763c28c79b128636dfc67719fecb13452ad
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 15:04:52 2010 -0700

    set dnsName on describe

commit 57d0ed654440353ef7765074a7c90c81ac441f92
Merge: e602d66 ba5850c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:27:42 2010 -0700

    merged orm and put instance in scheduling state

commit ba5850cb0500283540d5ab11fdb3302d5a7f51b0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:24:35 2010 -0700

    just warn if an ip was already deallocated

commit ae0e1bd3249158f01ba4aa71fa2a19006205ce4e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 14:16:14 2010 -0700

    fix mpi 500 on fixed ip

commit cc9d4fe4fb14c82ec5e0a0de77e335d08e3d9438
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 12:34:45 2010 -0700

    hostname should be string id

commit 5e763620a13109339236e9439c613c669dec84e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 12:25:45 2010 -0700

    dhcpbridge needed host instead of node name

commit 6279301e9ad388042d84519539d6be979ee59f2b
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

commit 06dcd7d2b389d31a28045c4a368ac4175fd02be0
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.

commit b3a1ab962a250ed054183249fb2ffa521f413b89
Merge: 816fd90 f7ae96c
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 816fd90c7212c095b609789eda9cf9e87245287f
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.

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b2deaa25bb5f03a8fdc8979703a633b549f32dd6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:49:36 2010 -0700

    couple more errors in metadata

commit e010588de7f2876a6ebc86cf5532bf2a96bc4a10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:38:59 2010 -0700

    typo in metadata call

commit 7269efe675f9001cf97b0749b2a392e639991784
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 05:25:57 2010 -0700

    fixed messed up call in metadata

commit 27352a4f0b61bf03bb1ba99aacc7eae5b2332182
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

commit 00ada8cbc9214ddd9161059b2dc400264029bd4a
Merge: 0257b81 b7e2594
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Sep 10 10:57:58 2010 +0100

    Merge with trunk.

commit 87d4c631d4a272f563f31132d6f5f0624aa8a690
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.

commit 9b11c6245a43be825aac0aedd16760716a84cac4
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.

commit a34cea09be470c6acaa13adbe910b5149a407656
Merge: a204978 c3d2bbc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 02:18:17 2010 -0700

    merged describe_speed

commit fe93b6895f7f2a70e855c0a17d45196814784673
Merge: 58b9e85 e602d66
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 02:02:22 2010 -0700

    merged scheduler

commit e602d66080cd2bff644433c8aa16bb9cc9d810c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 10 01:13:11 2010 -0700

    set host when item is scheduled

commit 6d24606838234ebf2d48a0defe51cb8e55d496ca
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:43:51 2010 -0700

    remove print statements

commit 33e9dae1dde26a3c663bc9bcf7f1a57bd3f50101
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:37:08 2010 -0700

    removed extra quotes around instance_type

commit 866c0fbb6a05900e8ed4e5233c1156e6904a13d3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:32:43 2010 -0700

    don't pass topic into schedule_run_instance

commit 58b9e85974e0e16dfc72f6ee2a51a370f5cb961c
Merge: a3236e3 14f4edf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:12:34 2010 -0700

    added scheduled_at to instances and volumes

commit c067e37675c826cefa6b6aeb50f5c0bef0234dc9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 23:04:30 2010 -0700

    quotas working and tests passing

commit ac47e864cdcc2319e458f60ea90277d69f56d463
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:53:31 2010 -0700

    address test almost works

commit 8d335ed12681b5dd5381f05e94d959718bd33775
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:13:38 2010 -0700

    quota tests

commit 20801d3ef852390c281aca1687e64887821bf654
Merge: e42d4e2 a204978
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 22:01:32 2010 -0700

    merged orm

commit 14f4edf1b64d84762ed901b83575b311f19bd194
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:59:09 2010 -0700

    fix unittest

commit 0421fc5122ac2323c4b2dd30c2f9994becfe8af1
Merge: 79951df a204978
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:58:02 2010 -0700

    merged orm

commit c3d2bbc8bc6ad7b732097159303e553ce6ed357e
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

commit 273c50b73e62d1259b5d7375bf18959c1758d115
Merge: 35c7688 a204978
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:52:58 2010 -0700

    merged orm

commit a20497893928a607c28dd3850a2b88984615bfa2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:52:06 2010 -0700

    make the db creates return refs instead of ids

commit e42d4e2c28d6e0a49d17d64a089c83a203e5c944
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:42:18 2010 -0700

    add missing files for quota

commit 79951df7877824a51ce948e3d0532e29c08ac231
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 21:29:00 2010 -0700

    kwargs don't work if you prepend an underscore

commit d51321dd75af7301eba1c956537d8accb1e62a15
Merge: b2686d3 0de87bb
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 b2686d33452581b31b3fbef26c3e4cf7e788f7ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 20:10:31 2010 -0700

    database support for quotas

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e0e8d59a60b7035e8226b4e47f9f92abdd0f6fc9
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

commit 33121e4885816e27772a080fe78a041d84eee513
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 13:40:18 2010 -0700

    mocking out quotas

commit 0de87bb237cfcf4a62fbc1baa589be20b22f4e64
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

commit f23642e259b6a2f7a723b0feb13fbd4eb7789601
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 12:38:33 2010 -0700

    floating_address is the name for the cast

commit 35c76882a95188d47e9264b208cef2c816447cb3
Merge: b8e47f7 4511611
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:18:13 2010 -0700

    merged support code from orm branch

commit b8e47f79f26d8188efa49e2faa3c00ca055e35b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:17:14 2010 -0700

    faster describe_addresses

commit 45116118ece676779d6c7dbbfd2c0cc16bf26925
Merge: 520170c 8a820c1
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 4dff1b5031cb0b89023ceb240cd90adab7e2e9ce
Merge: a578bfa 520170c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:08:26 2010 -0700

    merged orm

commit 520170cb0f549bbfc0f324ab0b5643063bd5595f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:07:10 2010 -0700

    solution that works with this version

commit 1253474b13c2bf12c6c33e4a9306f7aea2f60057
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 11:02:37 2010 -0700

    fix describe addresses

commit a2945371d879d82e989ebf2e2ee9f98772a4ca88
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

commit 45e7c970bbe37f79635e66f03329c4d1867697d1
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

commit 08e0e5978326d4de4a02e9401c431f33feb6afb8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 09:59:55 2010 -0700

    fix volume delete issue and volume hostname display

commit d5e7baf5c27b118d4e30d4a298b8f712ad3d3ec9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 09:52:24 2010 -0700

    fix logging for scheduler to properly display method name

commit 11d2bdc51bba14e37995deee81d1b1f509ffe6ad
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

commit 81a09b1c761b75633023888f1d6a9ef0a07a5cfe
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 9 17:35:02 2010 +0200

    Authorize and Revoke access now works.

commit 8a820c1ef906eea10ba4125b0f000a6d2fd5db1c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:53:57 2010 -0700

    list command for floating ips

commit 4419ba5247143b53f6fb5520b40c747165880aaf
Merge: d54c343 a578bfa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:48:14 2010 -0700

    merged describe speed

commit d54c34383f334a9fae07408d1896e605be848eb3
Merge: fe92113 f7ae96c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:47:49 2010 -0700

    merged orm

commit fe92113ebb45eccd556623e52bfecaa410fabd54
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:47:30 2010 -0700

    floating ip commands

commit f7ae96c86237c1281920ca1ef99cbb11494f8dea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 07:37:03 2010 -0700

    removed extraneous rollback

commit a578bfa6e99814ee4ec1caac0ae60d56b122be55
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 06:55:54 2010 -0700

    speed up describe by loading fixed and floating ips

commit 1c2e775308251fcfdfc793ec5ff1a0546858d41b
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Sep 9 15:13:04 2010 +0200

    AuthorizeSecurityGroupIngress now works.

commit a3236e39e9b52de54b33b5546b3bb74414a93673
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 06:06:29 2010 -0700

    switch to using utcnow

commit 30ccb39823376e06947b678c130c195c3449803d
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.

commit 255980ff9897d76c0340bfd88c8b5a8d6e383546
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

commit 73fcae53d88230e49b6d9f21db00d5fb40af922a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 03:20:56 2010 -0700

    logging for backend is now info instead of error

commit 5bffbd47abeda5756af40d94e3f59fa493e16285
Merge: aee90cd dd0add6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:36:08 2010 -0700

    merged orm

commit 9f029c334b50d24991a5dc6d1608630046a7ee8a
Merge: 47366d8 dd0add6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:35:50 2010 -0700

    merged orm

commit dd0add664ac6752ce02dd498c3e54c876f2e5e14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:35:11 2010 -0700

    set state everywhere

commit 47366d8f9a0969df3145bcf2d0023e5e02c7b02c
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

commit aee90cd52a438d28ab850a54036ca099a490427e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:23:31 2010 -0700

    missing deleted ref

commit 6ebce77126ffd950d8722e92361ccec8eb105a6d
Merge: cac0b2a 2bb9926
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:17:43 2010 -0700

    merged orm

commit 5f680398f881e4f03296fbc35f6e89a6d07860ad
Merge: 7161623 2bb9926
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:17:10 2010 -0700

    merged orm

commit 2bb9926564cc3256267e95a3763c12675fe4eaa6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 9 02:16:06 2010 -0700

    consistent naming for instance_set_state

commit 47f607152635cc1a02e36fd2d67c72697a387efb
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.

commit 356b0b36526d784976df8601f8c03a89ad267567
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.

commit 46fe04317782b031b0cdc1afce20b11c7ae6568f
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.

commit b7e25942e2a77f7cadefa0f05594c7516b843344
Merge: a12e8d1 67f3b27
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 8a8fea330870504b006634cec21b99d35c7d210f
Merge: c6908b1 19658d9
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Sep 8 14:04:09 2010 +0200

    Merge orm_deux.

commit cac0b2a68e28fec8b1195a76fff62b723e1a5d35
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:02:41 2010 -0700

    deleted typo

commit 74d2e3ccf9f97f30c4fb7817e1bb33d4411693fc
Merge: c37b3a2 38f467d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:01:25 2010 -0700

    merged orm

commit 71616231f968e1c6ed4bfd93fc56565b0d3476c5
Merge: 1f41bcf 38f467d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 02:00:07 2010 -0700

    merged orm

commit 38f467d83385999ae56e59e5979b9a771db364ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:58:59 2010 -0700

    fixed missing paren

commit c37b3a2c3e0ce498149ea9044f795c056e3ec314
Merge: 150a637 fe5d18a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:58:04 2010 -0700

    merge orm

commit 150a63730399a50d1b81261252889059d68aff11
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.

commit 1f41bcfe41f56a39347e3106527937fcb0ccb241
Merge: 49b25fe fe5d18a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:52:10 2010 -0700

    merged orm

commit fe5d18add209de06fe19808118182854a85c210e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:51:34 2010 -0700

    remove end of line slashes from models.py

commit 67f3b27aee615808de1d6b2c13950bcf26ef943e
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.

commit ebfff5605956dd246c3c8ea165b1983d9fdb2197
Merge: 67f1104 8cc295c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:01:35 2010 -0700

    merged orm

commit 49b25fe1c38913abd0153e7e6963be4448997e31
Merge: 25ed304 8cc295c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 01:00:12 2010 -0700

    merged orm branch

commit 8cc295c87224dab2a6f5f933a113bd2f1c5567ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 00:59:09 2010 -0700

    set state moved to db layer

commit 25ed304e0d559476c548945f26b2382a5a2abf8a
Merge: 76c5d84 67f1104
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Sep 8 00:34:20 2010 -0700

    updated to the new orm code

commit 67f110400d9f3350c1d6e6b4e857ea4c0fa5755d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:59:36 2010 -0700

    changed a few unused context to _context

commit e39d6c6d027eed0451c56dc89a65fe449bd2faf9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:53:40 2010 -0700

    a few formatting fixes and moved exception

commit 5b8ced3974106e55426f0ce4fb50981b28b03c9c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:45:50 2010 -0700

    fixed a few bugs in volume handling

commit b3959803246372393cddbce06fde57cdac212315
Merge: eab0fc1 b7e2594
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:19:46 2010 -0700

    merged trunk

commit eab0fc1f3bbfbddca2b9804669d8a0e8bbfec5ac
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 21:15:22 2010 -0700

    Last of cleanup, including removing fake_storage flage

commit 87b03a0ac23e6df6aec45bcd46d899c4fd89693c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:55:42 2010 -0700

    more fixes from code review

commit 6c1ef36eb70440a2d0b0ced0a307463dc02891a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:24:58 2010 -0700

    review db code cleanup

commit 7626d482ee76510abab55c7c9cdbf76aee1bf90f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:09:42 2010 -0700

    review cleanup for compute manager

commit 2ff104b81a9b04eaceea43ec5aeb7340538df699
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 20:03:07 2010 -0700

    first pass at cleanup rackspace/servers.py

commit 172f27060843d710e443f14ff442a9364015b2e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:48:38 2010 -0700

    dhcpbridge fixes from review

commit 80feebc818f4c747e92fbf61aca47bf437a47e34
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:48:12 2010 -0700

    more fixes to session handling

commit d0efd0c489b6ebabe1f32abb2761881d72355a75
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 19:04:08 2010 -0700

    few typos in updates

commit 0b2994c281aacf9dcfcc7aee840de4df65ce8e68
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:58:08 2010 -0700

    don't log all sql statements

commit 2b9910deaff0c7b1ab978e78ab0a71e978e63cd0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:32:31 2010 -0700

    one more whitespace fix

commit 1e9e3df01eb2fa17ad16d2c4e9ea67eeb903d9f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:32:08 2010 -0700

    whitespace fixes

commit bcef326598b4859506a2a6ebd2eb325fb467bb4e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:14:50 2010 -0700

    fix for getting reference on service update

commit 8c4ddc62e11116ab6866f60ff408ba20b6f80795
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 18:14:19 2010 -0700

    clean up of session handling

commit f8de9f19c6fc98c7baa8ccc4e25d898dbab9240c
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 files changed, 1 insertions(+), 1 deletions(-)

commit 76c5d84af4e73f46f7485b1d3d5929696ba23c48
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 13:01:21 2010 -0700

    fix docstrings and formatting

commit 4be28a6bccc971b953f9cf8792415364339bf885
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Sep 7 16:00:01 2010 -0400

    Oops, APIRequestContext's signature has changed

commit 8329cb1e3b797dfca956bf1acac8f9a110810c07
Merge: cba653f 292ba83
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 12:52:12 2010 -0700

    merged orm

commit 292ba83d79f0b72b89d805fef4bf946e6ecb550b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 12:37:18 2010 -0700

    fix floating_ip to follow standard create pattern

commit c6908b1be394afcf64664b72c0d009ccafddd31f
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.

commit cba653fd2e7f66a7aec7d8e26968ba497843f518
Merge: 2e21f6a 19658d9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 05:38:40 2010 -0700

    merged orm_deux

commit 19658d9b78b4320512e3efbf7ff8e714bde4b7c3
Merge: c73d461 a12e8d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Sep 7 05:34:37 2010 -0700

    Merged trunk

commit 24c5d82d612279b0714884f66556a646b6f63784
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.

commit c73d4610cc469a594f04886e0c97642a3fbb0551
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

commit 0257b81cfd79e4e95eadf5decc170e287055ce6d
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.

commit 437d4314d0cbe89b2cf336651a64cc1cf004e757
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.

commit 2e21f6ae5edc0c39465df7d9aad7808965547e10
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Sep 4 11:42:15 2010 -0700

    removed extra equals

commit a12e8d10b48719dbdcf85d19a8e33f946cefd88f
Merge: b2a53f1 7239202
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 3f2f3e49e69e2e0c51dd4fc29c58c5c193e46125
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:53:41 2010 -0700

    removed extra file and updated sql note

commit e2b66a80afafbabb668a6fb5b73225ee2f9d3174
Merge: 57a2f42 b828e1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:29:25 2010 -0700

    merged fixed format instances from orm

commit b828e1ada4ec1143bef3e2d61f4065ab341cc144
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:28:16 2010 -0700

    fixed up format_instances

commit 57a2f4208a8479c6994ec494d4a4ef9721150d59
Merge: 88088b5 a07837d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:12:54 2010 -0700

    merged server.py change from orm branch

commit a07837d54cb162971853a74e0b29b4f25f2316c4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Sep 3 00:11:59 2010 -0700

    reverting accidental search/replace change to server.py

commit 88088b5a29a51e2ae3eedb18c71f0783f3d47ec7
Merge: 0f786bc 5d91d29
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:13:41 2010 -0700

    merged orm

commit 5d91d2993e9fbccf118808b3851311433307db99
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:13:12 2010 -0700

    removed model from nova-manage

commit 0f786bc4c9d89d1e298dc5c708561d8287886d11
Merge: 97ed5cf c228017
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:05:18 2010 -0700

    merged orm branch

commit c22801729b2c9386cca11a3e072c589c9794422f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 23:04:41 2010 -0700

    removed references to compute.model

commit 97ed5cfa2e342e07187836e914f41e0bea88b0f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 17:06:01 2010 -0700

    send ultimate topic in to scheduler

commit 0f5a3b1097e31223f67b6293447614ac9429d5cc
Merge: 37ff349 be0d12b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 16:59:41 2010 -0700

    more scheduler tests

commit 37ff3496839d161a04bc9f6afb8bf9297af4fadb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 15:15:39 2010 -0700

    test for too many instances work

commit be0d12b4a9c33bec0e4166b696857d591e96b775
Merge: 7192df7 b2a53f1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 15:02:07 2010 -0700

    merged trunk

commit 7192df716103d00dfce324eb6ab7a15ac33f21a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:57:45 2010 -0700

    fix service unit tests

commit 7920b1112869f30c2e0a2f46586edd5710169d1b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:43:02 2010 -0700

    removed dangling files

 run_tests.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit f6436a35707ad8f3bbe8125f49042cbd266e8f5c
Merge: 28feef1 cf992df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:21:41 2010 -0700

    merged orm branch

commit 28feef1468bae8d893f5061285f2d07b0049605d
Merge: f5b8304 b5f1c52
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 14:14:52 2010 -0700

    merged trunk and cleaned up test

commit cf992df4bc1a017827c47801e869e4511d70e89e
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

commit b5f1c52418889f53608a3208c2e5669f97e1e426
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:50:14 2010 -0700

    pass all extra args from service to manager

commit f5b8304cc09c0e12f2d12aac43c4c509bca13274
Merge: 6741690 f8bd5a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:43:39 2010 -0700

    fix test to specify host

commit f8bd5a8a78764c24d3b0a05574b6c886b3a13481
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 13:42:31 2010 -0700

    inject host into manager

commit a85266403f36d79eb0bc3445af81e2d7f64051ed
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Thu Sep 2 15:34:33 2010 -0500

    Servers API remodeling and serialization handling

commit 08622bb039f548cda0060a82059588142bb28f67
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

commit 9175c8250d32fb66f6658111ccc6c285848cad88
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:55:30 2010 -0400

    Cloud tests pass

commit 5a50ac1d43672f0c91b81678b88bd8de34a7eca7
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:53:57 2010 -0400

    OMG got api_unittests to pass

commit 46ae2d37858b18a68a41eed7d77e04ca4aa1fb99
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.

commit 05f44e3ee694f141d3a9b289459ad53eb3c5c067
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:10:55 2010 -0400

    Remove unused APIRequestContext.handler

commit d033b0a8b66a2c09cc511762fc4519eda3a421b6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Sep 2 15:07:24 2010 -0400

    Use port that boto expects

commit 67416904de6f74a463bf4ccac15012379d135a61
Merge: 36d08e2 697009c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:33:06 2010 -0700

    merged orm branch

commit 36d08e28dd9c18a58d895908eedc35c0b0cf37c0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:32:37 2010 -0700

    scheduler + unittests

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7373c96f009fdb61de7e1c7894f721c54e824ae8
Merge: 3f4acb2 b2a53f1
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 697009c7991b21d6ed3b092a79be4890075c08f7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:28:50 2010 -0700

    removed underscores from used context

commit 150764a3b63180e0391670ce1254b304d96db43d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Sep 2 11:25:10 2010 -0700

    updated models a bit and removed service classes

commit 3f4acb267a6be8c1bd087c5c380c34319633c5d0
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

commit b2a53f19ee00252cde69cc5dfa259d53326dada0
Merge: b7e6aac a6a252f
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 a6a252fbb4dc8cd9ea4b17f58c57fc155f15f3e8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 17:53:39 2010 -0400

    Nurrr

commit 97873f773dd430eb2d65535a6e1a9e258b36cabb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Sep 1 16:27:46 2010 -0400

    Abstractified generalization mechanism

commit 7239202437201c86841f94ad6ddea879bc0e29da
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.

commit b7e6aacd1c1716ac4105d83a0472fd304bb61b0b
Merge: a137a3e 3c73b52
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 a137a3e3a7f6a7d28a03dd34fbc62b7c7a1391f8
Merge: a4930cf 30e77df
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 462f498be370839b92cae818963c5d32fde7d426
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]

commit 5ed5861e845e22a0b2db8fd32bd70af0339d3926
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 :)

commit a4930cf4d901bab467231c3eabced25dd91d2246
Merge: db7aa77 b664fee
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 7228d33e8aa0fc3ad0811ae7933fe6a02eb9029d
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.

commit b664fee33dccaf50909b7a645375326707e04944
Merge: 8e38f42 db7aa77
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Wed Sep 1 11:41:22 2010 -0500

    Merge from trunk

commit bb50efa72f59b406c88480809f37715eca862600
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.

commit 949f21fdf458818bce250c881dd27d1241adced9
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

commit e9462f64469aa2e76d92ed583228f4afc5c42600
Merge: 7e18b9a b6df199
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 23:21:30 2010 -0700

    merged orm branch

commit b6df1994e4a8b25009717f467297122d2faf1cde
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 17:35:04 2010 -0700

    pylint clean of manager and service

commit 522b8d7ce726a8b0299cf670fbadb53b0978ef36
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 17:00:48 2010 -0700

    pylint cleanup of db classes

commit 9108e8412d0ed23924783628cf110533b54d3bb7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 16:48:41 2010 -0700

    rename node_name to host

commit 01607a59f6aa871b6b2fb8883ee8ea48001443e4
Merge: bddbe98 db7aa77
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 31 16:16:01 2010 -0700

    merged trunk

commit db7aa77ecb6fcc5e16ddda1308635a17fc2b760d
Merge: 2d3d014 09f11ba
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 30e77dff4a0f3c912afb654645d1b235f3ed272d
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.

 setup.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit ba0457f30df6b1a31578249a121997332af9aede
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 13:25:31 2010 -0400

    Remove all Twisted defer references from cloud.py

commit 37b840c82a641f5e71bbe859f619c9ce967e1693
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

commit 64f5bbf57a5216623adf6971cbd355f1ff647891
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 12:15:29 2010 -0400

    Move cloudcontroller and admincontroller into new api

commit 2d3d01491216ff806224c04febb326953b226fcf
Merge: 4d69638 8392588
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 563c1650c7d25e39f70751e58eb3301798d47229
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 31 10:55:53 2010 -0400

    small import cleanup

commit 83408a82fb71bec7d646f3f6e0d0e0d2798564a2
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

commit d92c0fea6ced71b37dc38ec27f80fe3fdb0e4cdb
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

commit 09f11ba18e6dd9c9147b7b2f652f6020e15cab75
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.

commit 839258829f6686b55c23171c1786eede92423ad5
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 files changed, 1 insertions(+), 1 deletions(-)

commit bddbe984495201c4f99a7bf36efc3bffe7bd5588
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 22:21:47 2010 -0700

    a little more cleanup in compute

commit c5385f6717a5b950f6515d055e1509daaa0a375e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 22:13:22 2010 -0700

    pylint cleanup of tests

commit 9e3d004284b45e1f2167e75f2b3ad4d3f80f58b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 21:21:31 2010 -0700

    add missing manager classes

commit 0d8a895ee75a58e773455d49fc88c4f7b15cdf9e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 21:21:11 2010 -0700

    volume cleanup

commit 30636ed8a6491377e1420c29e842d2da48a85dd4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 20:42:31 2010 -0700

    more cleanup and pylint fixes

commit 9414f519ea6dce515eb69f29e3561bb7dee886d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 18:10:52 2010 -0700

    more pep8

commit d1818dc483a258db01dc45ef1b8b1e9d4483b92d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 17:58:02 2010 -0700

    more pep8

commit 474126941e2c94f6838342e31b3cdee1c1b2ea51
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 17:53:59 2010 -0700

    pep8 cleanup

commit 59b75f86ce022b807e19b33ae30861d845a7eb75
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 files changed, 1 insertions(+), 0 deletions(-)

commit 4260a678c6d3b34ee3492825dde67a1b685c80c0
Merge: 9008b5b 4d69638
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 16:44:30 2010 -0700

    merged trunk, fixed a couple errors

commit fe95188717229f1c16e4cd24e1c19c150c1a3568
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__

commit 10a8f5b5900abca4d131afdad3fa874d4556e77a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:10:17 2010 -0400

    Move APIRequestContext into its own file

commit b8ca34faef9b885112f47cea8f1cc627d0c5a74a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:08:22 2010 -0400

    Move APIRequest into its own file

commit 9008b5b109bc70ab811c96a5e196c2a7b504333c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 16:08:17 2010 -0700

    run and terminate work

commit ed109140829ddbf58ed5cf8a8420c28ad3a61f0b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 19:04:51 2010 -0400

    Move class into its own file

commit 788afef18703d8994ccbcefe6b96cc7c3096c6ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:48:45 2010 -0700

    fix daemon get

commit 964a906934d8294506f88ab3dd1f568ecdec988c
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 18:38:26 2010 -0400

    Notes for converting Tornado to Eventlet

commit a74e3c709592433b5c2dbf72f4d5d43a2eda5325
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:15:00 2010 -0700

    undo change to get_my_ip

commit 62b3c8772258d4993e5ff9d70da070ea52e2cadf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 15:11:46 2010 -0700

    all tests pass again

commit b5d0f1c80a5f7d79b1230af99cfd1b062873cc9a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 13:06:07 2010 -0700

    rollback on exit

commit 1f759688e48d063eeec2beadd86ecd31863f9a5b
Merge: 2ee8220 e25c4a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 12:58:52 2010 -0700

    merged session from devin

commit e25c4a42c9f03121e0562bfe3996894a5140b9b7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Aug 30 12:49:31 2010 -0700

    Added session.py

commit 8e38f428ceb341ddd0641f0fc1b22a53e7ed98d5
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Mon Aug 30 14:04:47 2010 -0500

    Removed get_backup_schedules from the image test

commit 2ee822056da778d5f80dedead4423b530dd88bde
Merge: 739bf0d 877de14
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 11:27:31 2010 -0700

    merged devin's sqlalchemy changes

commit 877de1471d67c472d23b16418396119982046cdc
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Mon Aug 30 10:51:54 2010 -0700

    Making tests pass

commit d1aeb0f5507a71a3fcae05e0e0ca16c1d1d7c4ad
Merge: 97fc353 367a74f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 30 12:56:33 2010 -0400

    Merge from parent

commit 4d696388ecfeed36899f44b88164de44ab7ebec2
Merge: 559c6bc ed1de59
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Aug 30 16:53:28 2010 +0000

    Reconnect to libvirt on broken connection.

commit 559c6bc337e1579b4a0a6332b2628d4b78b2e1c5
Merge: 4ff9799 6ad6d45
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 16:49:52 2010 +0000

    pylint fixes for /nova/virt/connection.py

commit 4ff9799d99f069e542ae57196cec938d562f9dba
Merge: 48f3f24 3dfce0e
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 16:48:12 2010 +0000

    pylint fixes for nova/objectstore/handler.py

commit 739bf0d0a3604c8c5f7034e47dccabd629f8136e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 09:03:43 2010 -0700

    ip addresses work now

commit 48f3f242c9a3245e3d368cc56e3680ca13a86dcf
Merge: 85d8dff 367a74f
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 3dfce0eb6739bbcb651e8e964a1028e40191223a
Merge: 81a590f 85d8dff
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 10:36:59 2010 -0400

    Resolve conflicts and merge trunk

commit 6ad6d45c1399b341e4e46647a8a25aaa617477c7
Merge: 57617c8 85d8dff
Author: jaypipes@gmail.com <>
Date:   Mon Aug 30 09:19:14 2010 -0400

    Merge trunk and resolve conflicts

commit ed1de59b3cf3c98e8eff2dccd38e0260bee87435
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.

commit fe561f553123bf975990bf39e240b87ed5bb5835
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 30 00:55:19 2010 -0700

    instance runs

commit 85d8dffc2256d2133dd98a9b0dbbee8fa4e1df32
Merge: 298cdba c7e8421
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 30 06:23:17 2010 +0000

    Dead code removal.

commit 1084cf311cce1b48267ef2058a85627b190cfda1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 29 22:41:43 2010 -0700

    remove creation of volume groups on boot

commit e38de9da92ee9a7e29bfec9dd2ea61699668b063
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 29 18:53:47 2010 -0700

    tests pass

commit aa64ddb4dc755e6dcd0be5ef3f3ecb4fd22d6758
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 23:20:06 2010 -0700

    Making tests pass

commit b941b2b2ec04bc88016448cac3c2ff9e83f51fb2
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 23:06:40 2010 -0700

    Making tests pass

commit 14195ad51ce050dbf7fb75683acba5d8ded931de
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Sat Aug 28 20:32:48 2010 -0700

    Refactored orm to support atomic actions

commit 1882c807733e3b58bd8a31401a51abe7d59d1b41
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 28 02:02:07 2010 -0700

    moved network code into business layer

commit c55bbfee5681f8473d34c2ab32b5774252572ae7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 23:16:31 2010 -0700

    move None context up into cloud

commit 4c09366de8e8d8a202e0e4993ee3babf721cfaa9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 23:10:57 2010 -0700

    split volume into service/manager/driver

commit 0e5f745d88fd29745a7c9565abb31b848daa52fd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 13:46:27 2010 -0700

    moved models.py

commit f1d820c973a7ed32e68ef98ff39f221ef0268927
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 27 13:45:05 2010 -0700

    removed the last few references to models.py

commit 0ccf99465904f04dc9ecb500439baf3e88ab40df
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.

commit 3c73b52d33726e4b93f0d15b194ee08947fbccbe
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.

commit c290eff7dede97c6f1e96406b3b0f570f832b8e1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 26 12:56:07 2010 -0700

    fixed service mox test cases

commit 31a19214f6628ea022fdc7e3498ea5f5ac9ddb6f
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

commit 06ada04d1fea3f3e7fc6ad27b4ab84088a790928
Merge: 39b00a4 298cdba
Author: Cerberus <matt.dietz@rackspace.com>
Date:   Thu Aug 26 13:35:13 2010 -0500

    Merge from trunk

commit ac49e2caa2495a2bcc57c750e58f8abac74aac54
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 26 11:28:05 2010 -0700

    fixed volume unit tests

commit 97fc3534c7a07299b13ebd3d94603fac6a9e5bd8
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.

commit 06a8dd99197ae306e518b591b652522cc6c25ab3
Merge: 7b0d9ac 298cdba
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 26 12:45:20 2010 -0400

    get to look like trunk

commit 9f889e5ea12513d509ef9586678082c8cac36edb
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.

commit 1f7cf9deee87af118df6cfcd269fb3f32a96a5c4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 16:44:10 2010 -0700

    network tests pass again

commit 298cdba95cbdaa07ade74918e70900aa57539264
Merge: 103b890 3a88ab9
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 3a88ab9e8d4f675e6181c6c7465ecad47056cb94
Merge: e875bca 103b890
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 16:22:49 2010 -0700

    merged trunk and fixed tests

commit 367a74f7a1c3e45ec94747e581bf38009afeb689
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 17:48:08 2010 -0400

    Support GET /<controller>/detail

commit 39b00a474082a3ab460aa6156e7d11bdef177562
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

commit e5c50e70d8f38740fa623273830d50dbbdd87135
Merge: 797768e 103b890
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 16:49:32 2010 -0400

    Merge from trunk

commit 797768e01f540bd7742e363125ec7a12e0f39feb
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

commit 2255e33057e72ab5221a01ca115c2342f656f4c8
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

commit 5607bd9541b7a5a745988dd026de930eec86016b
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

commit 95181b4d0fd04d3c94da4112fa8803e49e2a5f6e
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

commit be3b2907a38d00ba94102e211bcad1f5fb57dab7
Merge: 2a4acf2 8c2b799
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 25 13:14:02 2010 -0700

    merged jesse

commit 103b890ca929fc157263712453c55a5ac78d5cac
Merge: a79f5cd 7b0d9ac
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 a79f5cda72de9a79f7d60f1b2b4f152d2c0e6c0f
Merge: fe5cfdc 2cbc731
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 17:36:03 2010 +0000

    Fix a pep8 violation.

commit 8c2b799a72463754a1c21f9b3b90ab87a1cec9b5
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 25 13:27:36 2010 -0400

    improve the volume export - sleep & check export

commit c324e4da5c53533d200d89b8b91898e687d6ee22
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

commit 2de118f35d9fd0a853c05530cf08cac2063d95bd
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Aug 25 12:59:54 2010 -0400

    update volume create code

commit a0437f064097a7335b3c54759cdea2bcd270b937
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(+), 0 deletions(-)

commit 7b0d9ac3e097bae865945f9c68ddf95ddf2cbd6e
Merge: b946ef8 fe5cfdc
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 25 10:38:25 2010 -0400

    Merge from trunk

commit 7cfa137751009812879e39b1c1754a28ccc458cf
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 23:09:00 2010 -0400

    small tweaks

commit f4d72d6e870d67093257b5b2707b0fec23a7111d
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:51:48 2010 -0400

    move create volume to work like instances

commit 713a7fb99af3bbc2de199aa210ae9113968d43a6
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:41:34 2010 -0400

    work towards volumes using db layer

commit 5822d1e3eb8d3f4ce8f5ea01f8ce8335ba9779ce
Merge: bce3d19 2a4acf2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 22:29:36 2010 -0400

    merge vish

commit 2a4acf274a7d81fa3216a3af8e26c7c066d16542
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 19:15:35 2010 -0700

    fix setup compute network

commit bce3d19d22b4b18a08d9b12449fe38f3167053f0
Merge: acd1f7b fad894e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 21:59:41 2010 -0400

    merge vish

commit acd1f7bce53b709edcac1c79664bc2e7baca20dc
Merge: 5956481 eab75e2
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 21:59:04 2010 -0400

    merge vish

commit fad894ebb1a4dc0956ac9013adc6b31e59606c6f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 18:56:07 2010 -0700

    use vlan for network type since it works

commit 59564814c513ccc0d707afb047b3877f796a922a
Merge: 71b331b a578e53
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:33:16 2010 -0400

    merge vish

commit 71b331b57b7ced1f1e6a4be18181360956d54809
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:30:06 2010 -0400

    more work on getting running instances to work

commit 77763b63c63db3dd03c92162bc89f379cb753f2d
Merge: 12b82be afd3b1e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:08:16 2010 -0400

    merge vish

commit 12b82be57d3fc0134e3ff2a4ab00921cbf0317eb
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 18:01:32 2010 -0400

    more cleanup

commit b30ee03e899e8c6cba9a479c53abeb33500ce4c8
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 17:03:03 2010 -0400

    Flavors work

commit b946ef804bf95a981e5d99684d188836614273af
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:24:24 2010 -0400

    pep8

commit fec74120ea3843ca48a0e4d9c7e592ad105b0ada
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:17:06 2010 -0400

    Delete unused directory

commit eefde2213ceca0e98bf017568d5ba7bf7d97a3bd
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 16:16:41 2010 -0400

    Move imageservice to its own directory

commit 87b6ed1a036f1b79815d0ce139bfa5f63ba30c83
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Aug 24 15:23:52 2010 -0400

    getting run/terminate/describe to work

commit 6dda7d68e82e24d71143efa228f4da1e08cbc30d
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)

commit 5f45e6cc9087fd5417ebdb5db1f4146c01bd447d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 24 11:19:51 2010 -0400

    Style fixes

commit eab75e2a1f4909502b64ba026d0b24899d853668
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:54:16 2010 -0700

    fix some errors with networking rules

commit c001e485776ec4c143d20f5b79083cc8b4ff6468
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:30:48 2010 -0700

    typo in release_ip

commit 77de9e27c8ec7367ba95b6b62ade928a9cc1dec0
Merge: ac00c5e 5956481
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 24 01:14:10 2010 -0700

    run instances works

commit fe5cfdc14e64cfd7add30d7294bb6dd4867c5dee
Merge: 744f1f6 7f12dd9
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 744f1f6a142064d6d71a8df8651ecd6817fa0e21
Merge: 6bad44b b4b3ccd
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 ac00c5e6a64fefabfc9322527f944312e2abf65d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:48:16 2010 -0700

    add back in the needed calls for dhcpbridge

commit da2800f8033eed9712fb41db9c8a662a9a86d072
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:35:46 2010 -0700

    removed old imports and moved flags

commit a578e5346e3df440379e3cb0143ccd0f1bf8710a
Merge: bef89f8 77763b6
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 bef89f814c732c7573c9b93dcb2dc4f5c8e1492f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:25:09 2010 -0700

    bunch more fixes

commit afd3b1e35aaa92321717b625be261976f74cfc95
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 22:06:49 2010 -0700

    moving network code and fixing run_instances

commit b16796ea66ea3b7c96aabdec167c8b9ca45475ea
Merge: 8c55867 87b6ed1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 20:40:35 2010 -0700

    jesse's run_instances changes

commit 8c558674ecb4715456f86700d806b039d63292a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 20:39:19 2010 -0700

    fix daemons and move network code

commit 6bad44bc6a43b9de3f4930dcae748eb057a5ca35
Merge: d9d2247 5662889
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 8cfe274d99f981c9c608203f3bb6f070ff3f2ace
Merge: 9f30b0e d9d2247
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 23 14:36:14 2010 -0700

    merged trunk and fixed merge errors

commit 9f30b0eced9ba151b4fb61d4454bc97b87969f20
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.

commit e1e93ac7cf01f52180a9bc0a14f4875a50dffcec
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 16:43:25 2010 -0400

    Merge fail

commit 5b0a4b131d42e03c80c6cba894a9794c524ccdee
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 13:26:10 2010 -0400

    Get the output formatting correct.

commit f93c4362875a98097a77ca7e5f87bd3356655e02
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 13:07:43 2010 -0400

    Typo

commit f86f2754b8a928c7e20092d166e492bc02bd7e76
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

commit e8c6a8e23305a22fe471e6afccb5bc84aaadb02b
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.

commit 9a56c00f275c07f680fee8bb9b182e65b3ff4b5f
Merge: 21429f9 d9d2247
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:47:12 2010 -0400

    Merge from trunk

commit 21429f9d1c97d818c53f1a3e4efe6edd0cf56e9d
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 12:46:29 2010 -0400

    Serialize properly

commit 96b56dbc5e23301002f8b22e6dcd7cabc82376aa
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

commit 1507c462d56076b1b9047bb08145ef56ebd6e3b6
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 23 10:27:59 2010 -0400

    License

commit 27057bd319a819aca074778b22fe69963442dc34
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()

commit 89400cc82ae54d7ebcd9506dc617b19c7fe8a14f
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.

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 198181ce7728598f3f6979fbbf58ab97a765985f
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

commit e84d8569fe55f9a07b183afcda643062dc1cd008
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Aug 21 11:54:03 2010 +0100

    Added missing "self."

commit 7a50d8a8c30a2fe32074a23c97eddc6d3ec0eb4c
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.

commit e875bca7cf367bd2fb37d31f7f75684f61485280
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

commit b4b3ccd75cbe75e59b82d29e1e6a9c10cb64bcab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 20 10:08:05 2010 -0700

    small fixes to network

commit 0de7bf34536a3bd0f8d65889db7cd9067272ccf2
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Aug 20 14:50:43 2010 +0100

    Fixed typo

commit e785a125b52785feb45ca7e8618adf2ea66262e7
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.

commit d9d2247b2f470647025147580c1ff879fa0cd044
Merge: 286de9e 2a02e9a
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 286de9effe19f552646e6e700ec1b55dd2b8f0c4
Merge: 2608ba4 430131d
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 20 01:23:32 2010 +0000

    PEP8/pylint cleanup in bin and nova/auth.

commit c0cc10c06cea4e1f127d49a9f0a7a584923b771a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 19 13:58:43 2010 -0700

    move volume code into datalayer and cleanup

commit 2a4bb0dbea8c5aaf8b78f434f30fcb0e9380f056
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.)

commit 2608ba491a40b8fda05067eccdfa5e1e19c24d79
Merge: 6e05155 0698317
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 92acba2cb13fcc3ee3d67ee1af21584baaccff8f
Merge: 37a6c5a a570fbe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 19 11:13:53 2010 -0700

    merged termies abstractions

commit 5662889c663181af83c3901ff084a28b01f62618
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 19 15:12:46 2010 +0100

    Move deferredToThread into utils, as suggested by termie.

commit 4d27d98108f9db67497479bce4e2510d40db59a4
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 19 15:05:13 2010 +0100

    Remove whitespace to match style guide.

commit a570fbe26be3da6aff746851f192f7e490f7ff98
Author: andy <code@term.ie>
Date:   Thu Aug 19 12:28:45 2010 +0200

    Data abstraction for compute service

commit 8fbd4f259ef05c962dd83cb8e473e3b9fec440ce
Author: andy <code@term.ie>
Date:   Thu Aug 19 11:12:44 2010 +0200

    this file isn't being used

commit 430131d0fd8181c02b67867ba69565e8bf3152f5
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.

commit 06983170a4323a44c26ef79b26baf0e2dcccd2de
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 18:38:34 2010 -0700

    More pylintrc updates.

 pylintrc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit 37a6c5a856d206607fc56b029537cd4693c9a575
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 18:32:08 2010 -0700

    fix report state

commit c7e84218159c93948804c1a912031ab72e78d99b
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.

commit c78e2f9cb475f7a02d349923b47c4cb97344ad7d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 18:03:58 2010 -0700

    last few test fixes

commit 73452fed2d0b1ae718127d48f4c71c67b8420545
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 17:39:12 2010 -0700

    More bin/ pep8/pylint cleanup.

commit 51507bd1bbd9520f76c610af0019b640dbdc0257
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 17:38:51 2010 -0700

    fixing more network issues

 run_tests.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit a877ab763cfffc03193a9f763969eb7f62785e41
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 files changed, 1 insertions(+), 1 deletions(-)

commit ed0040869e83667fc7333b02faf92b66831385bc
Merge: 61ce59b 2a02e9a
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 23:27:18 2010 +0100

    Merged with trunk

commit 0ea0c7c5f2eddd52119ad36f4e640947e621d28e
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.

commit 2a02e9ab137263d506ef706c04603e8525ff6312
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

commit 612a36adb268898bdfecd1eb57e13d41d74cffa3
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)

 tools/install_venv.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d9be8c7c5b2f2fa2514d3c32b9d7763a52289560
Merge: 43929aa 6e05155
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Wed Aug 18 22:14:24 2010 +0100

    Merged with trunk

commit 45dcfd551d62a9e2a725c29aea2408e952a8e530
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 13:11:49 2010 -0700

    use with_lockmode for concurrency issues

commit aeccc3d4959c3a403d1916aff32ada2e9d0eeeb4
Merge: 508298a 6e05155
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 16:04:54 2010 -0400

    Merge from trunk

commit 6e051552e82af9086b2cb12e11f1a20326ea0384
Merge: 08de331 9297e95
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 508298ab5cfa16fdd1787650fda7e41097f59792
Merge: 0c4be7b 9297e95
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 13:09:34 2010 -0400

    Pull in ~eday/nova/api-port

commit 254c858ad0948493ce0afd2ae7057a5c23ebe84f
Merge: a508da4 08de331
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 09:38:30 2010 -0700

    Merged trunk.

commit a508da47ae31d0d53ee04a56540423917a4b230d
Merge: 1f00378 9297e95
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 09:36:28 2010 -0700

    Merged api-port into api-port-1.

commit 08de3319fe5b8a83e95e8e05c7249105a91f3146
Merge: 02378a2 0407d32
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 0407d3226c6942fd2a75c68baf1ac9510068754a
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 12:09:29 2010 -0400

    Missed one

 pylintrc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 9297e95556d14f156162c2781dd48263349d15a4
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.

commit 2cbc7315247b5e5226d48b6903ee200e32a235fb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 11:53:41 2010 -0400

    pep8 typo

 tools/install_venv.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 6ec08ed0a0b86caba1403647dfd96498eab0f05f
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.

 tools/pip-requires |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit aaef34413eaf37532c78963f67364aa09a6b36b6
Author: Eric Day <eday@oddments.org>
Date:   Wed Aug 18 08:39:28 2010 -0700

    Fixed typo.

commit 0c4be7b20d607bcf887f59b8802bd59730dac696
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 11:19:40 2010 -0400

    Image API work

commit c094701f042a183f0696e874cd30152f4e6820eb
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Wed Aug 18 10:39:59 2010 -0400

    Newest pylint supports 'disable=', not 'disable-msg='

commit 3fa245ea8b33d0b382174467b100d63f5a41f22b
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 files changed, 2 insertions(+), 2 deletions(-)

commit 4cc24f43a7996735079788f74bcf31d4befc89cb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 04:08:32 2010 -0700

    tests pass

commit 185285fea88ef6b1a6d103e02431fe2f2b482814
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 18 02:07:04 2010 -0700

    network tests pass

commit 1f003782c0878f0a65093dae01459b0a0306c4c6
Author: Eric Day <eday@oddments.org>
Date:   Tue Aug 17 23:46:16 2010 -0700

    Added unittests for wsgi and api.

 pylintrc |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

commit 9a466737ada8dc7897a28557fb22b77fc7161fa2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 20:33:37 2010 -0700

    almost there

commit 9be3a498c73c333922c125f659d3fbc890799bbe
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 19:41:17 2010 -0700

    progress on tests passing

commit 13c80b87a5d3958f9631d81b354c35b0e5126fe1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 18:10:11 2010 -0700

    remove references to deleted files so tests run

commit b51872f651d6e65a95e9fb72da2459ec97195bb5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 18:08:39 2010 -0700

    fix vpn access for auth

commit 86ecf84ed71ec049550978d8dbf71b41c9a902c8
Merge: 29e4968 02378a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 17:58:52 2010 -0700

    merged trunk

commit 29e496847d4c6d5f78e17a6e7a73a3acc4314878
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 16:56:16 2010 -0700

    removed extra files

commit 624c1e8a7e12d8075f3f39898225e12eac7f9276
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 16:55:45 2010 -0700

    network datamodel code

commit 632fd297388668c4294594fe6465a31a77cc141d
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.

commit 02378a2f0d4b08596809061e8e09b2680741c850
Merge: d2079cb 92760ef
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 7f12dd96acd69466dcef2e3f657b4d492e1b36ee
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Wed Aug 18 00:05:06 2010 +0200

    Stylistic improvements.

commit 9d2673641f9d4d45cc8b5c9452f6b1b166468420
Merge: 9f8b51f d2079cb
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 d2079cb3c23cd9f64a242034a6afaea3baf09549
Merge: 0652417 fa4876d
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 8b615920dd183a5b5952664b01934153651a1771
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 13:02:11 2010 -0700

    start with model code

commit 4045fea9c2d90bde899d3d61fe3d621e50e9f638
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 13:00:46 2010 -0700

    clean up linux_net

commit c37acb59f66329494428a40de20554af99cff109
Merge: c1999f6 bd94375
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 17 11:11:36 2010 -0700

    merged refresh from sleepsonthefloor

commit 0652417f38f2af8a00827872081792bf72ac76f2
Merge: cb5a756 0badf53
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 0badf536d5c90360e17c15fd6a3cd0182af6e47f
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.

commit 0528b4fd64c06069c19bacf01d862c73cb937fa5
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 17 13:03:38 2010 -0400

    Remove duplicate definition of flag

commit cb5a75696a156e25a3ff238b23dafa9683b88a7b
Merge: 9611645 8177609
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 81776092564c02f503a72133a4bd4ab1d4baa821
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 files changed, 10 insertions(+), 3 deletions(-)

commit 0bfb04c0165272c8fd4a1db4f47a8072bc4dd2e0
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.

commit 9611645fa76b866df2ba4d3c5f6fc8b86f2595f4
Merge: 08a66d1 33c5728
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 7e18b9a3842df64136387db225f379b7046e262d
Merge: 6a8edbc 08a66d1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 16 15:56:28 2010 -0500

    merge from trunk

commit c1999f6cb6f55598979ab1f320cfcdbcbe359c03
Merge: 4b4eda5 08a66d1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 12:10:08 2010 -0700

    merged trunk

commit 4b4eda57930485f2fa5d1e2f52007de9b28c396e
Merge: f2d8678 4660fa8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 12:08:31 2010 -0700

    merged trunk and fixed conflicts

commit 08a66d146f1fd8b213a884ce08a673bcadc8c72c
Merge: 4660fa8 4e47d8e
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 4660fa84580762ed940ff5412ade35048dcb685f
Merge: 30c6277 2e9f4f9
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 81a590fdfd23f4d639c403ac2f3e6e4635340bb0
Author: jaypipes@gmail.com <>
Date:   Mon Aug 16 13:56:29 2010 -0400

    Make individual disables for R0201 instead of file-level.

commit 441fe6c4c3fe20606506dd9e5a633f6389ab987e
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.

commit 30c6277c4cb71481ebd9bc44cd752c94c9ed0cbb
Merge: e738898 d4815aa
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 16 17:13:28 2010 +0000

    improve compatibility with ec2 clients

commit a40327fb6fc6066d56355a13082760da068f2a9b
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Mon Aug 16 10:57:42 2010 -0400

    PEP8 and name corrections

commit 33c5728b80dab5f5501915e561af721b62d5ef3b
Author: andy <code@term.ie>
Date:   Mon Aug 16 14:16:21 2010 +0200

    rather comprehensive style fixes

 run_tests.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

commit f2d8678fab202e07bac824521736def5a14e8ec7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 16 01:51:28 2010 -0700

    fix launching and describing instances to work with sqlalchemy

commit e738898c70d9592605247bf0c4c3eeedc9bea836
Merge: 8ebf9ff f2bbdad
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 be0678839aa0434edd6536427681ec15e3d94f1f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 15 16:37:06 2010 -0700

    typos

commit 4c4b71ccd03095cd6a06fa49f8d2164e4ae19237
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

commit 22fd040563b87efd100622fda04ead1e25ab41f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Aug 15 15:55:53 2010 -0700

    refactoring volume and some cleanup in model and compute

commit fa4876d9993519d217d4edc49e30cfa0e6318d4d
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).

commit 9f8b51f7dc580d7988708085ceb8ae4849ca5dd3
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.

commit bd9437560da1fd6898785a930a93f6b72c32cecc
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sun Aug 15 13:36:01 2010 -0700

    add refresh on model

commit ba6013111298a1ed458a39719454113edb0ed923
Merge: cda8d25 c1999f6
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sun Aug 15 13:29:47 2010 -0700

    merge in latedt from vish

commit 8ebf9ffc0d2452f47252a90bba0099b4552b0ded
Merge: 2b323dd 0c4daf0
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 2b323ddef71002630fb31cf286fc49d09f5d18e5
Merge: bbccca3 68d5136
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 bbccca3464f3c8c3876acc5a6523236c0e07d7d9
Merge: 4abd790 9a04ba7
Author: Joel Moore joelbm24@gmail.com <>
Date:   Sat Aug 14 22:28:05 2010 +0000

    Fixed path to keys directory.

commit d4815aa5e06683feb4fa21b1829f0e7e053364a6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sat Aug 14 23:23:03 2010 +0100

    Update cloud_unittest to match renamed internal function.

commit 4abd790c003a4acd25187ac1fa59b68c66c8aec0
Merge: dcd1fd1 ffc1cd4
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 dcd1fd199724f06c56a581a29dc7ed8279eb8c92
Merge: 67602f2 a43fda3
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 0c4daf05baaedbccab416ddead48572eb15e4494
Merge: f3d51e3 67602f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 15:01:42 2010 -0700

    merged trunk

commit 67602f2fab5b15ca53a1f1b0a4eb1a4bc57e3906
Merge: 3c01160 9e5f882
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 f3d51e33b5e609b36aa1092b8f0a0becd5c35e12
Merge: aa36f07 9e5f882
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Aug 14 14:38:00 2010 -0700

    merged fix-hostname and fixed conflict

commit 3c0116041208e171965e273132f59e08a8df2c4c
Merge: 6d88864 74778e0
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 6d88864073c90b44148d5c7e7410454ab8a5b211
Merge: 5e559b6 108eee9
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 5e559b60bbf26d9a66501ef60ed014ffa0e911ca
Merge: 7cb1a15 095dc5f
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 5e9ff6beaa909c783690056a09e8cca45d8191e8
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>.

commit cda8d257a7b6fcc623d3d2635b80ccbd745a81d2
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sat Aug 14 07:08:34 2010 -0700

    remove more direct session interactions

commit 70cbe3c77b81827c14bb3504a22637e597609592
Merge: 29f5ad8 f426aa9
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 f426aa9c78207c11ec6465744bc4905a50abb855
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 22:55:04 2010 -0700

    ComputeConnectionTestCase is almost working again

commit 210b4b97b0b868839482e45af2e928a2dcbab514
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 21:24:26 2010 -0700

    more work on trying to get compute tests passing

commit b28025bb9c4359c16fd9324be83dc3eac8fcb746
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 18:39:00 2010 -0700

    re-add redis clearing

 run_tests.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit a7348f06404a5fc711f126f2d0f42c6308aa0fe6
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Aug 14 18:31:23 2010 -0700

    make the fake-ldap system work again

commit a75a18621b88266cd30595d33d57e75462fe89e3
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)

 run_tests.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

commit 095dc5fb95f956a3d8ae6136c7452f404e2e9fbe
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.

commit 29f5ad8be6e6440321f6f8dbe1a6cf4a79a32801
Author: Sleepsonthefloor <sleepsonthefloor@gmail.com>
Date:   Sat Aug 14 02:13:12 2010 -0700

    initial commit for orm based models

commit f2bbdad3352af1257328b6d6c4433ff6c0dc0013
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:46:44 2010 +0200

    Add a few unit tests for libvirt_conn.

commit 74927aacc40fe53b7f530adefb3383ad55cf148e
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:45:26 2010 +0200

    Move interfaces template into virt/, too.

commit c7edfd8c07e1de276d1477a4c1dc20dce392cad6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:45:05 2010 +0200

    Refactor LibvirtConnection a little bit for easier testing.

commit 4598ab10f94cebfd6980c9c1d850818eb86b9718
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 23:44:14 2010 +0200

    Remove extra "uml" from os.type.

commit a43fda31fdc5a8a4fa5987263afb5e2394e38587
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 13 14:09:30 2010 -0700

    Fixes out of order arguments in get_credentials

commit aa36f07ed56122c8ec9d7dd187196b231feede38
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 13 12:51:38 2010 -0700

    pep8 and pylint cleanup

commit 6fb7a21b099db6de8bcf7b7801f2ff1286d42bf0
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Fri Aug 13 11:09:27 2010 -0400

    Support JSON and XML in Serializer

commit 92760ef8e96ad2236a7cfff6b2f226cf86318f32
Author: jaypipes@gmail.com <>
Date:   Fri Aug 13 10:14:34 2010 -0400

    Merge case statement options

 run_tests.sh |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

commit 2e9f4f9ef7ac1b4a1a284b08b009c9eb4200c211
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Aug 13 14:33:07 2010 +0100

    Added note regarding dependency upon XenAPI.py.

commit 1561bdd007ad23fdc61e047f6d3e649c92d621c5
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Fri Aug 13 11:51:33 2010 +0100

    Added documentation to the nova.virt interface.

commit e9c775c92b8eeeda3be1868b2f4059f71668b930
Merge: 976bc69 7cb1a15
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Aug 13 11:16:24 2010 +0200

    Merge with trunk

commit 0e9609fdb9e4437ec1af4486dd9cdb4a20618bd4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 21:27:53 2010 -0700

    make rpc.call propogate exception info.  Includes tests

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1ddaa622f97e2f024d3adcdad21af516c09d9342
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

commit 110ea3039b4dcfc1858de8569250ba5c697ee898
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 18:36:56 2010 -0400

    Mergeprop cleanup

commit 9b6a2a8870a3912b9d5c4f62a8f0abbe7ae59285
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 12 18:36:46 2010 -0400

    Mergeprop cleanup

commit f7be570f40c537547b5dc83077e4c05d72a6e098
Merge: e353549 b07837a 7cb1a15
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 976bc69156175428728d17fbd567aa0bc53ae786
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.

commit 4e47d8e476b7755bbf43c331d8ad3b32faf6491f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 14:18:59 2010 -0700

    renamed missed reference to Address

commit b767507c6ea9bf40014e9d0e695a74bcd2766699
Merge: 54facb2 961da8a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:43:14 2010 -0700

    die classmethod

commit 961da8a6c617144e6e78a0789d72cac27e51994d
Merge: bf17590 54facb2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:37:28 2010 -0700

    merged fix-dhcpbridge

commit 54facb2a4b91659b16be527348946829635b24c5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:36:10 2010 -0700

    remove class method

commit 2c69ab873a60b7b39f886492f5bf1af527bbc812
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 13:33:22 2010 -0700

    typo allocated should be relased

commit bf175908004c159f838fbebcac45bfd505119c12
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

commit 203ab212417d6a383b27291be619232cf4bb4fd1
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

commit ffc1cd44f62ed5ec5e25a9202490d672f98211fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 12 11:52:32 2010 -0700

    remove syslog-ng workaround

commit 5dcd6b243154e939de6e9bd4776ac8b48e4fcb64
Merge: bc74a39 7cb1a15
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 19:17:51 2010 +0100

    Merged with trunk.

commit 7cb1a15bd858bf29b7e6584af2999b7afd376b6e
Merge: 858d385 32695a7
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 858d385d0d118a9627a3c207b417722437b34297
Merge: 049f0b4 61071e7
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 16:37:18 2010 +0000

    Fix exception in get_info.

commit 4f3109e4bcc527a28531851656add55d699b3cbc
Merge: 6a50e39 049f0b4
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:34:59 2010 +0200

    Merge with trunk.

commit 6a50e39b203a344561672c9294c693cad20bcd0a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:32:11 2010 +0200

    Move libvirt.xml template into nova/virt

commit 791010082530ec47c5de9b5f5a3c1749f8517575
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Aug 12 14:30:54 2010 +0200

    Parameterise libvirt URI.

commit bc74a39c376bebd093d79546cbe403e9c5033b76
Merge: 828e409 049f0b4
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Aug 12 11:42:56 2010 +0100

    Merged with trunk.

commit 554e6d87bab043606a77afbbd874f595f4a66dcd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 15:29:14 2010 -0700

    fix dhcpbridge issues

commit f59a8054adac94b38bf958957e0f73d1e27d7e81
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 files changed, 60 insertions(+), 3 deletions(-)

commit b07837a790fc7ee0e8145c39a282a5dabae7cd9f
Author: Matthew Dietz <matt.dietz@rackspace.com>
Date:   Wed Aug 11 15:27:27 2010 -0500

    Prototype implementation of Servers controller

commit 592bdf9737aa84a4c605f7d2a799e9fa5f0e59c2
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

commit 049f0b4386e64e73b0e7944f50f945a258b85115
Merge: a59c4b1 d54900e
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 2253c9135f3382ee2afe39b39eb5d8c068bddfa0
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?

commit 61071e740e8efb06e8a2989ea16f07a8f1cd8487
Merge: d202dfc a59c4b1
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 11 14:23:59 2010 +0100

    Merged with trunk.

commit 9e5f882493037784803c838bc85c4eed40176426
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

commit a59c4b1431e8b6458f0c4ae53adcbaaf7988e88d
Merge: 602a3f6 8b4e5f8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 11 05:02:34 2010 +0000

    Improved roles functionality (listing & improved test coverage)

commit ac1ae0392d14ccabbebf56d4f1be6f61adf93e16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 21:51:18 2010 -0700

    support a hostname that can be looked up

commit 602a3f62b23d9e20619aeff3db448f102bac5d2f
Merge: d4b09c2 70d6dd5
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 d4b09c2547c26447d160d4162d9b61aa7f24c452
Merge: 8426b27 cb64256
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 74778e0522617fb34078ad13fec240054b5ae51f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 19:01:40 2010 -0700

    Fixed admin api for user roles

commit 3c35e9cf2645df6a876eb24fbd06edf91b1aa13d
Merge: 9cb85a2 6b03ad7
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 19:01:05 2010 -0700

    Merged list_roles

commit 8b4e5f820eea0a48d70f55fa242f3498efcbda75
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 19:00:35 2010 -0700

    fix spacing issue in ldapdriver

commit 8426b27adb8bb06cf7713f8d7365bc04752e2b2a
Merge: d9bab57 c875237
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 9cb85a2feaf01401e1bd07331938e42c7fba16bd
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Aug 10 18:46:49 2010 -0700

    Wired up admin api for user roles

commit 6b03ad7cd770d42dbc8bc88782578017a45561e9
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

commit ef6c8ad816f616dccab48bd369129c681e24a303
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 17:42:58 2010 -0700

    Throw exceptions for illegal roles on role add

commit cdd155668a1e432f61e5ead7aeda2a874c49ff49
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 17:34:20 2010 -0700

    Adds get_roles commands to manager and driver classes

commit 6a8edbce2c689431e68a0f93d696703addeafde7
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Tue Aug 10 18:48:33 2010 -0500

    more pylint fixes

commit d9bab57ebb78759312a5b13cfbc24afadb6d5db4
Merge: 06bbcb5 3152c69
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 10 23:13:40 2010 +0000

    Implement VIF creation in the xenapi module.

commit 108eee9cebc301fbd93fd39a202605f624d4d5db
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 15:45:24 2010 -0700

    lots more pylint fixes

commit 1e811ee4dd861201a8a645d1e14536842672c78d
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

 tools/pip-requires |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit a62f1f847ffba9101c389f6cafbb87c2849b6175
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:51:42 2010 -0700

    Pylint clean of vpn.py

commit e9f839f80bee1a49e25d14bfd17c764b7a4e3624
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:46:40 2010 -0700

    Further pylint cleanup

commit 70d6dd532e68cffe50be0ccac82b0ef822b399ef
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 files changed, 1 insertions(+), 0 deletions(-)

commit d9d342fdc1dd15ad8120a1e1a9717ca11b0bf101
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 12:27:06 2010 -0700

    pylint cleanup

commit f70616e1856342ae8e052f0712fe81cf1300f73a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 11:48:14 2010 -0700

    pep8 cleanup

commit 68ed09e4e98b5915c354ac3d77c714cad749c9d3
Merge: c5cf120 06bbcb5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 11:25:53 2010 -0700

    merged trunk

commit e0806c444cd3059272d1058ab4ecc8813d5d4f78
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 14:20:15 2010 -0400

    pylint fixes for nova/objectstore/handler.py

commit c875237802d8746d089c28dd2d7ea24480e0f5e4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 10 10:25:52 2010 -0700

    rename create_zip to zipfile so lazy match works

commit cb64256e5ff08195c79f70be52ce4f5570ed11e8
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 files changed, 4 insertions(+), 1 deletions(-)

commit 53de1df32ca66120a06d858f4fcc2c276e8ec23f
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 06bbcb5fbfd1fde6197252398ed3e97aa58c84f3
Merge: 45b1b75 8f6b943
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 45b1b7521ffa8e45bc9b255ad35d82467d74556b
Merge: e353549 d705f2b
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 e3535497a0f8a10975470d528948fde1103fa79d
Merge: c784217 8a07948
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Tue Aug 10 14:57:14 2010 +0000

    Merge.

commit 57617c860e86e9e3fb5029ab086f4eb7edd5e28a
Merge: 3d0b19c 4f7a84c
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:57:39 2010 -0400

    Merged nova-tests-apitest into pylint.

commit 4f7a84c23b277339b5f68828a7ce57e988c974ec
Merge: 014ae32 3d0b19c
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:57:24 2010 -0400

    Merged nova-virt-connection into nova-tests-apitest.

commit 014ae32878add08786ba3b56182791a434a02b7f
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:55:00 2010 -0400

    Pylint fixes for /nova/tests/api_unittest.py

commit 3d0b19c97c620642c91777ae32a810716ccc52d4
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 09:54:13 2010 -0400

    pylint fixes for nova/virt/connection.py

commit c5cf12089041f3d137ed2c2d459657ec37e11d3e
Merge: daaf84e c784217
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 23:44:13 2010 -0700

    merged trunk, fixed an error with releasing ip

commit daaf84eb2868ffa3bb5b6ab064e97219e23bb46b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 23:02:06 2010 -0700

    fix releasing to work properly

commit c784217d74df8eafc1dd9f9084cf6d8ef05c79d4
Merge: 38d44a5 9d07498
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 38d44a5d47dfdf9ea2e38121b291b42b0f47973a
Merge: 20ac829 6d635e8
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 04:52:54 2010 +0000

    pylint fixes for /nova/test.py

commit 20ac829a0d3601092253fef5380ab1e9bb74aab8
Merge: 738aa5e f9a3b11
Author: jaypipes@gmail.com <>
Date:   Tue Aug 10 04:52:06 2010 +0000

    Fixes pylint issues in /nova/server.py

commit 8f6b9435b0cd9309a06183ce55a1e3aca028e892
Merge: 3e87260 738aa5e
Author: Joe Heck <heckj@mac.com>
Date:   Mon Aug 9 17:59:46 2010 -0700

    importing merges from hudson branch

commit 3e872605dc86fb1e4976cd0f0235a5f94a632610
Author: Joe Heck <heckj@mac.com>
Date:   Mon Aug 9 17:53:10 2010 -0700

    fixing - removing unused imports per Eric & Jay review

commit d54e6e669974bbac1ce0ce32cd24a3cadce29356
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Aug 9 15:34:05 2010 -0700

    initial cleanup of tests for network

commit 32695a72cb1ea0d659ed89de35e0b5420b1b77b7
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.

commit 8a07948fd4cdf6653b23d550e0da0652c21fcb96
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 files changed, 1 insertions(+), 1 deletions(-)

commit 738aa5e3d84b543c4631e0ec2e6dc08eed567317
Merge: 5ce3a1f f064f5c
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 d9c69920c2d7d0c15a6e7f0b7c75890f85d12b2e
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Mon Aug 9 12:56:32 2010 -0500

    separated scheduler types into own modules

commit 6d635e808f9694139a58e144a8a219223edb8623
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

 pylintrc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 775e8feb4530becee27098f173966252b85dc55d
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 12:20:47 2010 -0400

    Disables warning about TODO in code comments in pylintrc

 pylintrc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 5ce3a1fca2a7d9957b8c20cab0f36fb1caa6d0d8
Merge: 0414146 1e90b6e
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 f9a3b118b56e38fc9021a139a56a1d0561763e8c
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 10:46:33 2010 -0400

    pylint fixes for nova/server.py

commit d74f237011208fabfb29cdff3d0a8c38b647e412
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

commit f064f5c0a8d6c5d48c3c67e3d757e78e8262e908
Author: Eric Day <eday@oddments.org>
Date:   Mon Aug 9 07:31:41 2010 -0700

    Fixed docstring format per Jay's review.

commit d10f0e6ff8c19024ec202fda47a41be7dad0aae3
Author: jaypipes@gmail.com <>
Date:   Mon Aug 9 09:47:08 2010 -0400

    pylint fixes for /nova/test.py

commit d54900ecac8b0354ec1119ec30b4bf955b6c4ff5
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.

 xenapi/README                               |    2 -
 xenapi/etc/xapi.d/plugins/objectstore       |  231 ---------------------------
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py |  216 -------------------------
 3 files changed, 0 insertions(+), 449 deletions(-)

commit 3152c699d1faf56394c2ab21a47ef2be7256929c
Merge: ff85e64 301c3b8
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 301c3b895b228497369b8758acf1e18b3cae37bc
Merge: f583fe9 ffd9cd1
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 ffd9cd12b4ee978b1767852bf7be1aef10ee3e38
Merge: f80979d 0414146
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Aug 9 12:10:27 2010 +0100

    Merged with trunk again.

commit 11efa27eeabbd9939c1f6d2d3b870e3bbf2b4417
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 13:31:40 2010 -0700

    light cleanup - convention stuff mostly

commit 41d2ca6f6921e896b38067846a0166e9feaab8b1
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 13:20:50 2010 -0700

    convention and variable naming cleanup for pylint/pep8

commit 43929aa90073f21b58aa690b8739d97ead34524f
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 13:05:24 2010 -0700

    Used new (clearer) flag names when calling processes

commit d07f503615053f93806b08d43a04f30d7c49e475
Merge: a68cb01 0414146
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 13:02:12 2010 -0700

    Merged with trunk

commit a68cb01e2038f4c8abbcfa7fe246ad9a031dd123
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sun Aug 8 12:57:33 2010 -0700

    Greater compliance with pep8/pylint style checks

 tools/install_venv.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 62f8c892680b077d4a3450f670a63af4aa7a953c
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?

commit 865290cff7b8f40872f3626623eeb53eca095cba
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 11:39:14 2010 -0700

    variable name cleanup

commit 422c7ae13eac03d5bc0854682ea045bf01b6bf73
Author: Joe Heck <heckj@mac.com>
Date:   Sun Aug 8 09:50:22 2010 -0700

    attempting some cleanup work

commit d2f3c33759509a5f7fe88b7ebf2741da4bc4a1a5
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 files changed, 2 insertions(+), 0 deletions(-)

commit 1e90b6e7935c26f4a1398fb6284e72121f635a45
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.

 pylintrc     |    3 +++
 run_tests.py |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

commit 8e668be10911644fac14d1b41f0d2582f3af3f56
Merge: c5388df 0414146
Author: Eric Day <eday@oddments.org>
Date:   Sat Aug 7 14:45:36 2010 -0700

    Merged trunk.

commit 9b00d50dac15b310cd3b4cdc9605695ad40ff208
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.

commit d1bebc10b0eb423f5311ed9b0d72bd9782276eab
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 6 18:06:57 2010 -0700

    Changed the network imports to use new network layout.

commit ca72931a95291b0b896217b64621ba9c47b31f88
Merge: 73de23f 0414146
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 19:20:13 2010 -0500

    merged with trunk

commit 0414146396f6aed780e1d08b790cf8b6dfb0dc43
Merge: 08bc637 04584aa
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 5c2ae64dd3b249487714ae5dc4ae5cdcd6a96737
Merge: 49f4a53 0d2b207
Author: Eric Day <eday@oddments.org>
Date:   Fri Aug 6 16:56:56 2010 -0700

    Merged Todd and Michael's changes.

commit 73de23face885806a4f62eb60daf1cbe629c878a
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 18:54:45 2010 -0500

    pep8 and pylint cleanups

commit 08bc63719e185c250a8e5b3b476f106a21fd2dde
Merge: 49f4a53 c5388df
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 9edc8992ffcf3301608ee32377cd46a8e53491e1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 18:10:41 2010 -0500

    fix copyrights for new files, etc

commit d705f2bea74b86232ff6bde8282f935fd6cfe5da
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

commit 944526d837455a031a0d94f2c73ea7398225664d
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...

commit 49f4a53cb275f815eb83de2796e280c666bb71fd
Merge: bce760d 9cbfe29
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 bce760d08136b25cba0fdf6da937bff150a9df37
Merge: a6d657c bb01250
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 a6d657c006662d5f342b2275ac7212a7ed3cd9d2
Merge: b3ba115 b626460
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Aug 6 21:34:37 2010 +0000

    Fixed write authorization for public images

commit b3ba1154c6e7d8feecd43731018d44cd4478e7e7
Merge: e9476a1 64c2208
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 9cbfe29083773c92a3ed3925e44bf7694ac75424
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 14:31:03 2010 -0700

    fix search/replace error

commit be0d6e53b836d3152f3bf08bee43ca12c0912914
Merge: a8c48fd e9476a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Aug 6 14:27:48 2010 -0700

    merged trunk

commit 07534a111abacbdaaa78f9a6a60fd7bff11fa65d
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Fri Aug 6 14:40:24 2010 -0500

    Start breaking out scheduler classes...

commit 0d2b207c9d3e4b231cfbcfa0d009554abbf31f9f
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.

commit 532b2de7db4b1f2050cd8af969659d243045ab8f
Author: Michael Gundlach <michael.gundlach@rackspace.com>
Date:   Thu Aug 5 22:54:08 2010 -0400

    Use webob to simplify wsgi middleware

commit 64c2208d7bc9b0d090b444b6d1f658c796dbad8c
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

commit 04584aa6e5f8d8c6f3dffaa1b13a148581cdad7e
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

commit b62646012a148b34f0cff67a9edd5b840972518f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Aug 5 16:20:26 2010 -0700

    Fixed image modification authorization, API cleanup

commit fe263f4ecca071716cc31988bb63f9596ba69eb6
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 15:10:56 2010 -0700

    fixed doc string

commit ef07fcf2f46250e9270bb5aba85db1cfbde10994
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!

commit de9238a9d610909c51c9a2bbe587503e3f9b2779
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...

commit c5388df1fee1902df3faa87d6a08957f792521ce
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.

 pylintrc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit c0d699477e27b96f82907a9a0aebb8da54a07567
Merge: 916c702 e9476a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 12:34:22 2010 -0700

    merged trunk

commit a8c48fd6bdafdc12f437adf2447326e499104a2f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 12:29:50 2010 -0700

    rename networkdata to vpn

commit 0dce9b2b2a82363457d57c5444dd94c71a29713c
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 12:54:13 2010 -0500

    remove extra line accidentally added

commit d4285ff3187e1855c177896c5dffbc4c6e14951e
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

commit ea3675515d2a8dbb66ca4a52a21a7cabe3ac6dd5
Merge: ec73f3c e9476a1
Author: Chris Behrens <cbehrens@codestud.com>
Date:   Thu Aug 5 10:31:14 2010 -0500

    merged from trunk

commit ec73f3ca96548a0e5978f97edab0d547023f6bb1
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.

commit e9476a11e98d08b27fa02ca6622c09adb1c3a1e9
Merge: 5193bd4 7467e8c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Aug 5 11:32:42 2010 +0000

    Fixes various concurrency issues in volume worker.

commit 916c702532669a5d4856cf445372e48b7fbf7ab7
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.

commit ff3b5e4272ce131746f1533cf6a59da972d9486d
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

commit fb16112dff70522ff4ab51970f81bc38de3d38f2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 18:12:19 2010 -0700

    method is called set_network_host

commit 8be1f27d79e1be932a28040ca30dc8dcf9093223
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 18:00:13 2010 -0700

    fixed circular reference and tests

commit b39cc8b82a63f8407a299cdfce7966eda3f60b91
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

commit afa6e4b13b21dbec78c865eb0a98604bce2104d4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 16:51:48 2010 -0700

    fix rpc command line call, remove useless deferreds

commit fa9f62dc3eabdab210de5ec5f50a47dd36e00353
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 15:53:24 2010 -0700

    fix error on terminate instance relating to elastic ip

commit 828e409ef0e92669bd1a63b88fcc0f1af5e4fb85
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.

 xenapi/README                               |    6 -
 xenapi/etc/xapi.d/plugins/objectstore       |  231 ---------------------------
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py |  216 -------------------------
 3 files changed, 0 insertions(+), 453 deletions(-)

commit 5b68d855ffb4203d40df7361e8da150fb0cae683
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

commit 17dc35be7c7532cd41209e93e6b1ac1968ca1f4e
Merge: 016bb13 5193bd4
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 23:23:13 2010 +0100

    Merge with trunk.

commit 8178021b17868934d3013fbf6b0ac778312fb957
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

commit e88e1486684e8c0a9fee70d8c2ae5146ac02eb73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:54:21 2010 -0700

    use iteritems

commit 866350839a8dacf6aafbe9595ef2a0cf21c3429a
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

commit 1097ed6eb00871d5bbf36c2899522288e6f43538
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

commit 9c291cd6d4040bf8ee82386863a3921181985b06
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:18:52 2010 -0700

    method should return network topic instead of  network host

commit 3470007b207f22feed1f8ce0d65dba5682b94884
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 12:02:23 2010 -0700

    use deferreds in network

commit 98799bea1417e3aae02aa9fc18116dd7f09d0ce2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:44:25 2010 -0700

    don't __ module methods

commit 361c28c74a6c649750a84c69e54440f1c9b5ace5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:18:46 2010 -0700

    inline commands use returnValue

commit 37288f98fdd9846496bc31177cddbf9d356d7bef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 11:12:58 2010 -0700

    it helps to save files BEFORE committing

commit 016bb13252da4ea89e05fcb88559f3ddaad6192d
Merge: c2ab7e6 bdffc97
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 c2ab7e67590a7232e037417c08bddc4d76b3e163
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Aug 4 11:14:11 2010 +0100

    Added note to README.

 xenapi/README |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 5193bd4ae80f14148d4d78adbc5437af49067550
Merge: ceb7dac bdffc97
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 ceb7dacd258067fca2236718e37b85c8df70a86c
Merge: 310884e 92f0f03
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Aug 4 06:07:48 2010 +0000

    Adds flag for libvirt type (hvm, qemu, etc)

commit 310884e0727b921fe4b8b95897a95ea69cef91b6
Merge: 2e557c0 5126426
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 dccdc021d518186f91c8f3edf751b090d16189de
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

commit bb012501a60f912fd831ee2cfab17d660c070f16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:48:49 2010 -0700

    use get to retrieve node_name from initial_state

commit 98e1a94ced13b4a2f9b56e23792b1d6a23acc4cc
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

commit f37db78f9d3d476b990c10e1e675e281e99dd055
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Aug 3 15:04:38 2010 -0700

    vblade commands randomly toss stuff into stderr, ignore it

commit 8019017fd60c12b3b564bca8c4445ecf70a68f98
Merge: 2e557c0 7467e8c
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 9f5d82235b08c0be9eea00904afdaffb97d3cb07
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

commit 2e557c087ced7a788d105412adc643076f284643
Merge: 2581d3f aabe13a
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 68d5136a69144e8ed60d297745ae1e96dadd685a
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@

commit 8bca9f692e2bd1d759c7224c6d44819bf11b8e4c
Merge: 6603f7d 2581d3f
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Aug 3 12:58:58 2010 -0400

    Merge from trunk.

commit 9d07498538356fb111b8c8b897d9183a87cd94c9
Author: andy <code@term.ie>
Date:   Tue Aug 3 18:00:11 2010 +0200

    updated doc string and wrapper

commit 4f92ddc2c4f580318681ef1f67d3f78595987ae7
Author: andy <code@term.ie>
Date:   Tue Aug 3 16:51:37 2010 +0200

    add copyright headers

commit d202dfcba4cbab5b9127aab47abba5dda1bcc4b6
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 15:42:17 2010 +0100

    Fix exception in get_info.

commit ff85e64723cfa380b02fbb522f86e37e60560dde
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 15:41:35 2010 +0100

    Implement VIF creation.

commit f583fe96ae55caaa61a1287d807c565562dcbf63
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".

commit 02f1da7a21d56804e475c2461eabdff30bf21f44
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

commit f80979da32d8b5d4f9fd23dc627e6807220f3958
Merge: 2cce667 2581d3f
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Tue Aug 3 00:54:02 2010 +0100

    Merge with trunk.

commit 2cce66775c511379e859cdcf942408d2c7cd09c7
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!

 xenapi/README                               |    2 +
 xenapi/etc/xapi.d/plugins/objectstore       |  231 +++++++++++++++++++++++++++
 xenapi/etc/xapi.d/plugins/pluginlib_nova.py |  216 +++++++++++++++++++++++++
 3 files changed, 449 insertions(+), 0 deletions(-)

commit 2581d3f6ac3a88037671d6a7e51a8bcacaaaeb4c
Merge: 25f1aec 063c892
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 d61e0fb457a73ec604e542e1f47c9c590741f33b
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.

commit 61ce59b318be0eceec34058c25906e0c971ee5dd
Merge: d0c3842 2485686
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 2485686061c2d0445454158aadc2465143668e12
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

commit 6a0cca5fe74bb175da7f620c17eacefd3651d915
Merge: 0438aef d0c3842
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Sat Jul 31 20:51:09 2010 -0700

    Merged with raw disk image

commit d0c384254ec27b56347e532abd4703dc93c49e01
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

commit 7467e8cc0891c59d04fd5788b3a96468f4ae65d9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 19:33:07 2010 -0700

    Fix Tests

commit 8247568dfcdc302c5e128fee9bd69cc631217efe
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

commit aabe13ad8d10bc35be04ad2e89d4b9dfd1b935f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 16:15:09 2010 -0700

    another try on fix boto

commit bdffc973bab1edf9498066928d40ae8c4f48d788
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 15:36:11 2010 -0700

    use user.access instead of user.id

commit dae0f59d5f130a9062dfde06d5a4e0ec2ef62101
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 15:19:41 2010 -0700

    Fixes access key passing in curl statement.

commit 0438aef100c84a7dcbb9868aa0b23b495b3c6959
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 13:35:21 2010 -0700

    Accept a configurable libvirt_uri

commit 6ec1f960addb9519a903139e2c2ffcd4691e066f
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 files changed, 1 insertions(+), 0 deletions(-)

commit e211940997c7058cca613aa04ec828ff97e92592
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:54:03 2010 -0700

    Removed duplicate toXml method

commit 02b02c0d8325c6fd18f01c079543b270e809f7ae
Merge: f2fc9fc 25f1aec
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 30 12:49:54 2010 -0700

    Merged with trunk

commit 0611bde5d9830360f4d54ef2d5748dcc1ad01449
Merge: d8d61ac 25f1aec
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 d8d61ac3a7a809fe8de208365af48747b7f71550
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 :-)

 tools/install_venv.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

commit 25f1aec605ca649199bd47fd7ba265274ef6f41b
Merge: 88ca0ab 81fee1a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 19:03:15 2010 +0000

    Make nodaemon twistd processes log to stdout.

commit 81fee1a41838750e303297b51c36b86b85e84bd2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 11:29:13 2010 -0700

    Make nodaemon twistd processes log to stdout

commit 92f0f030ab7f85cddd5cd6b6a781f094f3054160
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 30 11:19:03 2010 -0700

    use the right tag

commit 91eeeb93e6db1762b47eabdd29752aff4fe5bc28
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 29 17:58:44 2010 -0700

    flag for libvirt type

commit 88ca0ab997d7371acc539feb20b47e0f0031b8ec
Merge: e9b0e7c 5bacb17
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 063c89284c4b78297250937d3804ce34dac451f8
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 29 17:18:39 2010 -0700

    Added project param to admin client zip download

commit 5bacb17726a2ea91c8ecf19fcc16cb8a798977c4
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

commit aa65254709090c539b90e262387f29f1a2dfd8ee
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.

commit dad251ee21050057824674187c1ac5ed37cc68d8
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

commit 0e457c5628b27fc0a8c41243eb2268f6b8f7b05b
Merge: 52c8eb0 e9b0e7c
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 29 14:35:41 2010 -0700

    Merged with trunk

commit 37028b7a1efb3e0af914123d5ce296335a47f554
Merge: 0724b64 e9b0e7c
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 22:06:17 2010 +0100

    Merged with trunk.

commit b67d8ecd7dbefea226385a4de0f0e4e6632a3479
Author: andy <code@term.ie>
Date:   Thu Jul 29 20:05:22 2010 +0200

    strip out some useless imports

commit 86c90624c6b011d56a1a0586e3e83698a0d6aa04
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.

 run_tests.py |    1 +
 run_tests.sh |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit e9b0e7c96dc32abb5817e194361b1cd96fa25613
Merge: 8f517d3 a33db96
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 29 15:39:26 2010 +0000

    Fixed pep8 in run_test.py.

commit a33db9678877705bdc0eecd09c256c1f0a064a22
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 8f517d38c38cf8b40772a82bdc9003552549f491
Merge: 9a369a0 da2a2c6
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 da2a2c6577c1f753fa7beef9376c59b6896abc8c
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.

commit 3dc556cf50f4cfee4849c9bdfd9e5c6fe70aed45
Merge: 80efdc0 9a369a0
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Thu Jul 29 09:04:54 2010 +0100

    Merged with trunk to resolve merge conflicts.

commit 512642668a1880ac7a0c70bb340b794977f11d76
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 23:19:07 2010 -0700

    oops retry and add extra exception check

commit 3a7d89f021d94785f0d7e6d960f1b1df7a725fda
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.

commit 9a369a00b1eeca12a69149894b52e91754812de4
Merge: b6a0609 ec76aae
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 29 03:25:03 2010 +0000

    Added ChangeLog generation

commit b6a0609549919082f90d4df4eeb378b3d32c67d0
Merge: cd59e2a 937489c
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 29 03:23:51 2010 +0000

    Implemented admin api for rbac

commit cd59e2ad8a582a347f09c8327366d983bde260f7
Merge: 0173d3e 91fb4de
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 91fb4de16cfa261f0d83442fda60624acb09894d
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.

commit 0173d3e61ca3772d6e256d3dd329e767a1063e22
Merge: 44e4788 0724b64
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 0724b6407431a107d51cb56ead0b6a6cce1102da
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.

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 44e478865451a4f08ea577460897cc319495cdf1
Merge: a71d288 46186ab
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 23:42:35 2010 +0000

    Allow driver specification in AuthManager creation.

commit 937489ce59bc8645e175b445b4e8d523096afa54
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 23:41:43 2010 +0000

    pep8

commit 2e116c2207c6250425ec4e14aad6c17acdc04245
Merge: 6692626 36720ab
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 ec76aae47912e92211e91beb12fa3955905a0586
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 files changed, 6 insertions(+), 7 deletions(-)

commit a71d288cfac25af45a41333ef34da7c5bd5637db
Merge: 456ddd4 f1c7928
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:50:33 2010 +0000

    Use default kernel and ramdisk properly by default.

commit 456ddd43176cc8aaf5e3661797d78a9b5c8f2377
Merge: ce37a63 4d6c074
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 ce37a63785480d3f92ebab00579d722239e71220
Merge: 9291f00 12fae45
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 9291f00b82758aeeea32f2fa65757c40b2529c75
Merge: ba1286c f045583
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 22:44:08 2010 +0000

    Pass in environment to dnsmasq properly

commit ba1286c379a89baac5a4cb93a2d5562613aaf3ac
Merge: 36720ab e11767a
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 ab7ff55387715e487764ed2ab5c5bfcfe2f19c7a
Merge: 31ded5e 36720ab
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 21:40:08 2010 +0000

    Merged trunk

commit 3b0882c4680355840fde4ff525080263e9678a96
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(+), 0 deletions(-)

commit 31ded5e8171485972921f2b49f4844fa9ccab819
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 21:04:05 2010 +0000

    Wired up get/add/remove project members

commit 80efdc056b12a346b680767f5310cf16873850f8
Merge: af071dd b94b482
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Wed Jul 28 21:23:11 2010 +0100

    Merged lp:~vishvananda/nova/lp609749.

commit 36720ab599d0852bd42d1b2c0a801102831ca067
Merge: fdf039d fed02f0
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 46186ab4ee9adb30155eb46bce277fddf874ec90
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

commit 12fae45b23b0871d6fb8a8af2f9791ef9d2670b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 11:33:11 2010 -0700

    make redis name default to lower case

commit b274ef9d8cb8abe1d57d1e448f51da5ea7ec46d3
Merge: a8738cd 4d6c074
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:30:21 2010 +0000

    Merged get-projects-by-user

commit a8738cd3a586f0f15e53326296aa657fe3cc7ba3
Merge: 4e9dc7a fdf039d
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:24:52 2010 +0000

    Merged trunk

commit 4e9dc7aa8a40dd920e07e956727eea974430df57
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 18:16:09 2010 +0000

    Fixed project api

commit 4d6c074b07883b4b160c99f35fd4030184c9d213
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 10:47:53 2010 -0700

    Specify a filter by user for get projects

commit fdf039daefa3676f4306df61ad97a4ab5fc1c3a5
Merge: 9f20a29 393c3db
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 16:55:02 2010 +0000

    Create a model for storing session tokens.

commit 9f20a297ce15f8d09ce1896d4c5bafc1208ecfd9
Merge: 2886298 33309d3
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 288629895c63ed4b3a6bea06ed0406a0f71fa240
Merge: 93085f4 b4e1e60
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 16:52:30 2010 +0000

    Makes ldap flags work again.

commit 393c3db0da23db760c051a9fcfccb798d9d484c4
Merge: 8966477 93085f4
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 28 12:13:02 2010 -0400

    bzr merge lp:nova/trunk.

commit e11767aba142363d6be4d04283927d3c03eba515
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

 setup.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit fed02f06102e3025b68683cd0b3f354e3f36c677
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.

commit f045583d511b98ca0fe8966af0396ba1e26147a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 02:21:11 2010 -0700

    Fix dnsmasq commands to pass in environment properly

commit 93085f4f58c3856d557a3cdfb16e34b9e29a9285
Merge: 31ab711 d968a45
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jul 28 08:32:40 2010 +0000

    Got the tree set for debian packaging.

commit f1c7928aad26cad707d632eb9ee297894217a471
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

commit b4e1e605a180a0730ec3f453c02b229af8236d84
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 28 00:18:20 2010 -0700

    import ldapdriver for flags

commit d968a455b52b6b85ea12b1c172ae0c83b0f837ae
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 23:23:23 2010 -0700

    Removed extra include.

 MANIFEST.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit aa5d11f25627e02e37817b45a14825020f2254fd
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(+), 0 deletions(-)

commit 5e44511dabf67de775191843fc794049e1a1154e
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 files changed, 18 insertions(+), 1 deletions(-)

commit f821c459ed4bfe3901c15d22040e2c640cdd4642
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 f7bdf54ecec82e817a29fad7132fd807c740004f
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, 0 insertions(+), 25 deletions(-)

commit b8a6c33a00f0c827d15d8207d60cf4c1bb6f7a4e
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jul 27 21:39:58 2010 -0700

    Made run_tests.sh executable.

 0 files changed, 0 insertions(+), 0 deletions(-)

commit c394ad634822eaacabdb66a741106e76b879a0c3
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 files changed, 5 insertions(+), 0 deletions(-)

commit ef231238deac90a05ffdfe3a7b1c70caeb239e94
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 33309d3e0287237ee25210426337ed34eade2eae
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 19:51:07 2010 -0700

    fixed typo from auth refactor

commit 31ab7118152f1b80119117e63d8478b1db8ca740
Merge: e8025b8 70b5786
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 e8025b800e03d49155f6b12d6cd8f12b2bdeb03f
Merge: 7d4e1d4 f7d2d9f
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 5d32a11c2fbdf92c523719347ff937e5c0f63e65
Merge: 39204fe 7d4e1d4
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 00:32:17 2010 +0000

    Merged trunk

commit 39204fe2faf848430753bc056b175944a5de9091
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jul 28 00:28:56 2010 +0000

    Wired up user:project auth calls

commit 7d4e1d4bfaadaf805d9edebde7b48c36588ca6a7
Merge: b6586d6 8e6f452
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 22:52:37 2010 +0000

    Bump version to 0.9.0.

commit b6586d60aa0f078a6ea12e069aae0b526619381b
Merge: 627f0c5 f61ab8e
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 9a04ba74e4ea0e8e506bb97621481612804812d6
Author: Joel Moore joelbm24@gmail.com <>
Date:   Tue Jul 27 15:35:20 2010 -0700

    fixed path to keys directory

commit 627f0c506b0522989ec5a982c7b92f2820dfd708
Merge: 2274e5e 42296e6
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 70b578648dcf3932f62a232f6699e7b3629ac20e
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 files changed, 9 insertions(+), 0 deletions(-)

commit 42296e647c22f8d59dc57e216ee027bcd47d58b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 14:16:49 2010 -0700

    properly delete old vlans assigned to deleted projects

commit f7d2d9f25d56d6af4511ef00f4b7e31ac8534daf
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, 0 insertions(+), 776 deletions(-)

commit 8e6f452045a8b21aa30a11b1fed152844f8d7a3b
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 files changed, 5 insertions(+), 6 deletions(-)

commit 2274e5ecb98612f8127f52af9cefddd2c1daebf7
Merge: 88ea4dc e1d6a56
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 f61ab8eb3807b5c6c275a25b26cc091e31c79b5d
Merge: 571bb6b 88ea4dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 13:08:22 2010 -0700

    merged trunk

commit 88ea4dc58e5b99258ced4998ecf61ac21acef1a3
Merge: 60f54b3 065dbef
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 e1d6a56378954ca1c7bdb6e53d26466b06e5c115
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 files changed, 5 insertions(+), 1 deletions(-)

commit 065dbef34225ccbe364487d0380e858533737884
Merge: 521b4c2 60f54b3
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Tue Jul 27 11:10:19 2010 +0200

    Merge with trunk.

commit 521b4c2a2558e9b0b35cb18c90a12b0e3494e0ad
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.

commit 60f54b3a5bf15aff3099ddd11e1a3ec892095694
Merge: 84fae94 ee24e58
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 27 06:32:48 2010 +0000

    fixes buildpackage failing with dh_install: missing files

commit ee24e5825c5a98964f002bd093ecb95a3df1ab30
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 files changed, 2 insertions(+), 3 deletions(-)

commit 8966477581ff52a47fe2700abb646c237079990d
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jul 27 01:03:05 2010 -0400

    Flag for SessionToken ttl setting.

commit 84fae94dbd7d9b1b8c7927ee830a333bb8b1c258
Merge: 83c84c9 18f33cc
Author: Paul Voccio <paul@openstack.org>
Date:   Tue Jul 27 04:32:37 2010 +0000

    resolving conflict w/ merge, cleaning up virtenv setups

commit 18f33cc88441dde01e6611c27fc41a557d225977
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 insertions(+), 5 deletions(-)

commit 83c84c98866e737c5d68a86e6a53df1ea40b38ea
Merge: 8a388a3 eedd766
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 8a388a3a24b893cea8a0490eea0f1c794640bd87
Merge: f10e2b0 f0ed2c8
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 17ee7f05e36e6ebc5e1692264e9cd50ebea6e89b
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 23:49:49 2010 -0400

    Give SessionToken an is_expired method

commit f10e2b07b57c8077d558b652685a5375bb82abd9
Merge: ee90e3d f131f80
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 eedd7666e04ddd1a6c80344c175d3b9dad06ecb0
Author: jaypipes@gmail.com <>
Date:   Mon Jul 26 23:28:59 2010 -0400

    Fixes bug#610140.  Thanks to Vish and Muharem for the patch

commit 6603f7db31228f708dc04c917e7aae249a667a42
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 23:19:51 2010 -0400

    Share my updates to the Rackspace API.

 exercise_rsapi.py |   51 ---------------------------------------------------
 1 files changed, 0 insertions(+), 51 deletions(-)

commit f0ed2c84c93d361e9a82b4017a1074a40e684b09
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 ee90e3db4c83681fc82998f6ab47ba0bfc933b8e
Merge: 0d43005 1009947
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 571bb6b07bb680b20351821ebfed46772c6a3fa0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 17:14:28 2010 -0700

    renamed xxxservice to service

commit 5bd9b1f7f85a0391b1e569278386e0c64f615f6f
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jul 27 00:11:18 2010 +0000

    Began wiring up rbac admin api

commit f131f8038eae179c5ca0c13f2b8537355dcf9a28
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 16:03:33 2010 -0700

    fix auth_driver flag to default to usable driver

commit 0d43005ceea14b34674f4b731f3158a31f689688
Merge: 1665c20 4def4e9
Author: andy <code@term.ie>
Date:   Mon Jul 26 22:32:57 2010 +0000

    Adds support scripts for installing deps into a virtualenv.

commit 0b36d05911b1cb4723742fd9c3e6991f45fba0b5
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 18:02:00 2010 -0400

    In fact, it should delete them.

commit 2fe9a5d0f700cb0dc5009b7c80ebb8f80afde4bc
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 18:00:39 2010 -0400

    Lookup should only not return expired tokens.

commit 1665c20508ea2fe1a206d5dbdecd50ba368e0aec
Merge: 72ea43d 17c9156
Author: andy <code@term.ie>
Date:   Mon Jul 26 21:57:32 2010 +0000

    Adds support scripts for installing deps into a virtualenv.

commit 1009947e1d1e333a481a6b42426f1667fc42f372
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 14:48:08 2010 -0700

    default flag file full path

commit a0f1645a0db2ef46ea17e29fbb290b9970772f67
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 06cffbcaa4bb98c76f0a3a361de1f2347a2ae682
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.

commit 91b166d473c4879711385f92d352d627ece849ca
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.

commit 4def4e93ca3323866efc099441420bbe7933e7c3
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 5bf722dd5d950e7f55a7237e1550e92be0db2380
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 17:00:50 2010 -0400

    Expiry awareness for SessionToken.

commit b94b482cbba77565649e82b11038e7ea4c7f0d0c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 12:49:21 2010 -0700

    class based singleton for SharedPool

commit ff5cf8abc9a8bd8142b9a12f2aac7677950660d8
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jul 26 15:01:42 2010 -0400

    Basic standup of SessionToken model for shortlived auth tokens.

commit 63fbbb1c01ce3536952be19185ae9a8a4c2e6cce
Merge: 6922ff2 72ea43d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 11:06:45 2010 -0700

    merged trunk

commit f303a099220770ec00a8d802bb5ff383f0186280
Merge: 30846b4 72ea43d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 26 11:02:28 2010 -0700

    merged trunk

commit 72ea43d88ed4b6e72a101a1aef41c5b2fcef3642
Merge: 016b9f5 fc5cc8b
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 016b9f5ceb6d5a1849b05779d8dd9f30170103a5
Merge: 790c099 e3f6b29
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 26 17:57:31 2010 +0000

    Replace hardcoded "nova" with FLAGS.control_exchange.

commit 50226fbd8520fd7d2d562d9922ae5ac97cef6b75
Merge: e62eaec 790c099
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 26 16:05:31 2010 +0200

    Merge with trunk

commit e62eaeca690765d024ee68bbd08f280c0cfba7d6
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).

commit 790c0997fb196d012841989858873e57991638de
Merge: 3cfb64e 97d6120
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 3cfb64e20be4edaa9f26a4b7db77c33b7093968e
Merge: ea443db 8a364ee
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Mon Jul 26 00:14:03 2010 +0000

    Set durable=False on TopicPublisher

commit ea443db58333482cd010693e18fa052ea9e5ebfc
Merge: 22aa1c5 1151149
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 23:51:55 2010 +0000

    Added missing import

commit 6692626351a95e6f6266a972987065bde6ed7296
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.

commit bf3802179520aea9d4e98721bdc3437be13fe2fa
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 20:31:53 2010 +0100

    Fix instance cleanup.

commit 97d61206cbc863705ee3eeecd7687c488dccea42
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.

commit 30846b4943815c0a0587b4f74ab4762e6a97144c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 11:23:24 2010 -0700

    removed unused assignment

commit 69d9475d409f985c0929057ab2f1b9ef161e2683
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__

commit cafbf6d542f110001e08872b4965dea88534ab19
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.

commit 22aa1c52d5d27fa5061829af34e13539e9256254
Merge: 757634f 7a0f0c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 25 16:45:17 2010 +0000

    Changes nova-volume to use twisted.

commit 757634fc6f808706bc893045a736a2c9b44f0cf8
Merge: 6ac96ce b6f7d3b
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 6ac96ce02c80ee4d058c993b94e19539db350c75
Merge: bc3d4ce 0da7f60
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 c7926cd0e81459479f0aa9c857db74af90f7de78
Merge: ec44d8a e3f6b29
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:43:45 2010 +0100

    Merged lp:~ewanmellor/nova/lp609792

commit ec44d8a92f92f97c7d4829e01cbcaa2aaae3f505
Merge: 0ad3fdb 8a364ee
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:43:34 2010 +0100

    Merged lp:~ewanmellor/nova/lp609791

commit e3f6b2958443ae886c680f34e1c85103b8611340
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 17:40:41 2010 +0100

    Replace hardcoded "nova" with FLAGS.control_exchange.

commit 8a364ee76b6101978859300428b74a033b8fbdb3
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.

commit 0ad3fdb14ddb86f69cc4157a0da800c5490e9f2b
Merge: c1d9fbb 1151149
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:38:31 2010 +0100

    Merge lp:~ewanmellor/nova/lp609757.

commit 1151149a93871ba57698e1044e899334ac65e9d3
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.

commit 3a06f3a7b3b2b108276e77a081cf6b53a4764cc1
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.

commit c1d9fbb715243f5a07f514e1120b02c44ed15f37
Merge: f921db6 af071dd
Author: Ewan Mellor <ewan.mellor@citrix.com>
Date:   Sun Jul 25 15:11:20 2010 +0100

    Merge ~ewanmellor/nova/lp609749.

commit f921db69199262920e8e4a63b60fc59c67015b92
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.

commit af071dd6df9181c260fbe4aacf020d02b72c5b49
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.

commit 47c67defeacab7321b52fb9e5f891c0a40a2950c
Merge: aff5138 bc3d4ce
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 25 14:29:37 2010 +0200

    Merge with trunk.

commit aff5138311eb79b80a37542fa3a342dbc5e17a6b
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.

commit bc3d4ce37d80cce2020a7b54232feecf8bcfae37
Merge: 589984e 1c9afa2
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sun Jul 25 01:45:17 2010 +0000

    Updated the README file

commit fc5cc8bd503317def23306fedee2e774b524e01c
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.

 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 ---------
 setup.cfg                  |    4 +-
 20 files changed, 2 insertions(+), 1385 deletions(-)

commit 1c9afa27b28de57f4a30b3503dcd90cb11027e21
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 files changed, 9 insertions(+), 5 deletions(-)

commit 14446bd05229a50556f891aee67b6944a5ef67f7
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).

commit 29f225b8f2b1b01daeb9dda187c41c050bf60367
Merge: 388406d f78dc34
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 388406d050f6a64fd11945055a2eb6b84ec20fb3
Merge: dd4cb3b fc2470b
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 0da7f600a48710ed9e527cef82af0c26a2d825e2
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

commit 589984eb8b52880c1a8c2eba0ce8efbae926504d
Merge: fc2470b 65489bc
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 6922ff2b4a7c9323a8c764582321494c824dc612
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 23 15:27:18 2010 -0700

    renamed xxxnode to xxservice

commit fd50341d87383eee96232f59812198c7a688efd0
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.

commit f9be697c251fb70c26daa1c555f016e2802d7f4a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 23 08:03:26 2010 -0500

    Check signature for S3 requests.

commit fc2470ba5510e33bc3e6f8c0a35142750a14cc41
Merge: 7fbca3a 1b0dce2
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 7fbca3a4c0c1640b195513a6cc974510fdc2ffcb
Merge: 0b11d8d e545ebf
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 17c9156487470722c3a4c1e496a1d68b1ea24de4
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(+), 0 deletions(-)

commit b18638128b03b93da143db5c5ce3a72e7b9d0527
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

commit 52c8eb0fcbf7d909c847c678d03a281886e7df8f
Merge: 634159b 65489bc
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 634159b19989320276a3de56d85ac5acccd6d471
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Thu Jul 22 12:28:47 2010 -0700

    Check exit codes when spawning processes by default

commit f78dc348fc5454907e3f6992e4f091c3ea63f13d
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

commit b93d2476d2b2b45d8e8726c8a50d7a3f5b309eea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 22 09:03:28 2010 -0500

    syslog changes

commit 34cf18d979d9d1fe10378d758b7b12ed53cb6568
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 22 07:51:03 2010 -0500

    typo fixes and extra print statements removed

commit b4027431146f602cae932dc644846d94907b2283
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 21:54:50 2010 -0500

    added todo for ABC

commit 65489bc9e5d983ac97cce8142774fc431ab646ab
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')

commit f327e09ae8677f6e896c4717aa7cb2ddaa143c46
Merge: 4378f3d 0b11d8d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 20:15:28 2010 -0500

    Merged trunk, fixed extra references to fake_users

commit 4378f3d18728c4d55621779d627b141c53f0d82a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 19:56:08 2010 -0500

    refactoring of imports for fakeldapdriver

commit 12d04674a89ee7ed52b6015431aee7b88932ad07
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 14:55:16 2010 -0500

    make nova-network executable

commit dc8ce41efbf9bf1c7d6b978fe2396c83e43c7ece
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

 run_tests.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit b6f7d3b82fc56e0a2bde1087b827ebbe809264b5
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

commit d8e14e23e0e350932ee416c901b3473614521321
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.

commit 0b11d8da0fab05ce0046c2f1ee86a63c77715aa1
Merge: 161fc33 dd43346
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 7e48f0617bc9934224f226e7dd6e48d137281f6f
Merge: 161fc33 7a0f0c1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 21 09:35:55 2010 -0500

    merge with twisted-volume

commit 7a0f0c1a0e0010fd29c788c07c00f225b6f780f3
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

commit 1b0dce23be6b8cc7ab69d5b4b07a4be4a712f073
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 22:28:23 2010 -0500

    fix for describe addresses showing everyone's public ips

commit 161fc339e3f08a571931095a64c24b0c94a2ffd3
Merge: 395bf5c 6dca452
Author: jaypipes@gmail.com <>
Date:   Wed Jul 21 02:57:31 2010 +0000

    update the logic for calculating network sizes

commit 395bf5cf261296ecc0fc7f9f6cb2bfbd78fec78c
Merge: 515eac7 5fb351a
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 5fb351a8453cfd3715f4dd079a46e129c1933ae4
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

commit 515eac7ca27465db16748ec30ef26c77865bdc76
Merge: 04a10b6 0bfdcb6
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 e545ebf3f71ff7742302600138920ea61b4e7c7c
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 files changed, 1 insertions(+), 1 deletions(-)

commit cc5a65f58454af58b0bde0ba597019177671d6f0
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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit f2fc9fc570cd345dd19990db00b980748014fb15
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Tue Jul 20 14:31:55 2010 -0700

    Cleanups

commit a7862130b9fe5132df125a130a898655ce1b6ea9
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

commit 8c7d9b70bdc6694e4e8e5b36b7872a86137d5875
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

commit b3b9fa327acefe15467c72027f17a28c5a207370
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

commit 0ddff8ef2bd8a0aed3ebfba0ebb8d5c9fbb8af70
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 20 09:22:53 2010 -0500

    network unittest clean up

commit 0735c8f8e81caf1704bb8086e14f89b6e473dcbf
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

commit aa1c0f62c361fd5448af771ea41880a263a15606
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

commit c56e5405707155ca4d0919d0ac34a5748e47ea96
Merge: 5d332d5 2c420f9
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 5d332d5132101e8553c19ba4ddb0a64f2eb43b56
Merge: 04a10b6 53314ec
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:48:01 2010 -0700

    Merged bug fixes

commit 53314ec9df64eeefdc5566c8cd77ce1703306705
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

commit 54bfb54ee2ed15961c898b662a8fe74cd15364fb
Merge: 04a10b6 dd43346
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Mon Jul 19 21:38:57 2010 -0700

    Merged lp:~justin-fathomdb/nova/bug607501

commit 437e24a709ebc50e92a0f37ffa15e002cf4e7fd8
Merge: 79d10af 04a10b6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 20:27:44 2010 -0500

    Merged trunk. Fixed new references to UserManager

commit dd433467edafade89ec23345f8064513733d7516
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. :-(

commit 79d10af1926231cbba6e86530c3c67f3c84793b5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 20:20:41 2010 -0500

    More docstrings, don't autocreate projects

commit 07bd5bb9a96376db531d43518d097f9a7fa636f9
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

commit ff9ac09de7abbdb37a7317cc8ef28d89a1a10ce3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 17:10:25 2010 -0500

    LdapDriver cleanup: docstrings and parameter ordering

commit 2c420f9043ef127c8c30a628ca796804d81b055d
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

commit 04a10b65bc4811f90e36a35843b8a7865a283ca8
Merge: 0263f75 8bb599e
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 8bb599e48e9ae59a6c5ba0e8cd36983f848e0154
Merge: 57efb3c 0263f75
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 19 14:45:39 2010 -0500

    merged trunk

commit b40e34e8bc1d76bf5f4a55ea73fbc780f06c2f4b
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

 run_tests.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 6dca452fe3add0c341042dbe44aecf2df4a9bf17
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.

commit 0263f756b487212953e8d15c1f1cad5c8b853bd5
Merge: 85f8df2 74aefd6
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 85f8df26ce30f9c7486a3b38da92b2e2906e07d5
Merge: 1316cdc 2d36b21
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 1316cdc43988d8484972c58fdffb2f675d9e1810
Merge: 05178a9 8248b68
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 05178a9128a80ce0cea4028070d4ecc0039912b2
Merge: 8767276 6279b47
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 18 20:32:53 2010 +0000

    Replace tornado objectstore with twisted web.

commit 6279b471dcdefa7571c52ecb57a515ed3e57506e
Merge: 7bcd6f9 8767276
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Sun Jul 18 11:26:50 2010 -0700

    Merge with trunk.

commit 57efb3c426c8a7737e0772b704b5bc16af372f49
Merge: d979c3c 8767276
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jul 18 13:25:43 2010 -0500

    merged in trunk and fixed import merge errors

commit dd4cb3ba2e20b4f95ec99b2f18ed46f94dae58e1
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.

commit 7d3596105f84f451f46469e3e795ab1988b9e631
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.

commit 71685fb895e6f9425615af70b8fd950c1d577eca
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 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 8248b6892243b3d06dc652af1b32c0fc43dbd531
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.

commit 7bcd6f90e9dccdbf25de0b5941981876aaac931a
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.

 debian/control                     |    2 +-
 debian/nova-objectstore.install    |    1 -
 debian/nova-objectstore.links      |    1 -
 debian/nova-objectstore.nginx.conf |   17 -----------------
 4 files changed, 1 insertions(+), 20 deletions(-)

commit 6a31bb8340533551fc5a0c1cf5d8d3e76ffb6d0b
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.

commit 8767276779ca798c7e90e0e942a6ffe67483e3b1
Merge: 9111597 9df1d27
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jul 16 22:42:40 2010 +0000

    Minor post-merge fixes

commit 91115973884cbf335d1e8bfbcfe23df226745951
Merge: 8a37776 e0cf8f1
Author: Justin Santa Barbara <justin@fathomdb.com>
Date:   Fri Jul 16 22:37:28 2010 +0000

    Fixed _redis_name and _redis_key

commit 8a3777639a05784f04fe66311efed15120751bc3
Merge: 194dadf 663e0d5
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jul 16 22:27:24 2010 +0000

    Add build_sphinx support.

commit ca32abfcd786c587a4780695abe2543ac2a77826
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 files changed, 0 insertions(+), 1 deletions(-)

commit 1761378fddc7b93e55322b0dc4383a6364c075a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 21:52:10 2010 +0000

    make nova-volume start with twisteds daemonize stuff

commit 2d36b218b77e8ab47dbe7319e924846158745643
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Fri Jul 16 14:07:57 2010 -0700

    Makin the queues non-durable by default

commit dde5c694abf35b07388af4cd8a9a429b819002a4
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Fri Jul 16 14:02:37 2010 -0700

    Ack messages during call so rabbit leaks less.

commit f727b5ca30aceac11ca0b6b799886c506d77d257
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:50:08 2010 +0000

    simplify call to simple_execute

commit 9540c1667385e55190ee8bf47dcd127d67f7b7e5
Merge: 15555db 0bfdcb6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:46:15 2010 +0000

    merge extra singleton-pool changes

commit 663e0d5e62df52e6d35290cd7c3f51da73492c8c
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 0bfdcb64d5fac9d6b4079cbc3fab82de42f1bfd4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 20:32:51 2010 +0000

    make simple method wrapper for process pool simple_execute

commit 15555dbf53a8147ae3821ac7aba2a27cd2a1493c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:58:50 2010 +0000

    change volume code to use twisted

commit d05f0eb0871fa3a2b9718df6cbb46a74da8b715c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:58:12 2010 +0000

    remove calls to runthis from node

commit e910e9e2c20d97dc1fdbfa6bdefbb1fd9bd0885f
Merge: 5da3efb 24b7cdc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 16 19:57:27 2010 +0000

    merge with singleton pool

commit 24b7cdc553b126a0abc1802b2fb2a556bd38389f
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

commit 9df1d27104edacf81b1721f65dc33778707e2a8c
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.

commit c11e2398dbdfbf9d3c753dd6ec2b896096b8dd02
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.

commit e0cf8f1e4f3818db736055a108dab8f743e4f6b8
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

commit 0e650798b9a2a5dc18b7e9571149baaacb77eef9
Author: Jay Pipes <jaypipes@gmail.com>
Date:   Fri Jul 16 12:41:13 2010 -0500

    Quick fix to variable names for consistency in documentation...

commit 45a0b24223e10dcc662acaad21a2d066a91b7d5b
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...

commit 194dadf46a54be80609ddde77098ae78aff5ec18
Merge: 07925bb c12e0c1
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 16 11:09:15 2010 -0500

    Merge lp:~anotherjesse/nova/remove-vendor

commit 07925bb46e5ca1e4bb441d8357487a09f704aa8f
Merge: ee40b63 81efaad
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Fri Jul 16 11:07:00 2010 -0500

    Merge lp:~vishvananda/nova/remove-print

commit 74aefd6de7df4dbdfc524ab0e5e17e5c4cef076a
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(+), 0 deletions(-)

commit 81efaad51cce95a2c49c1df758a5bc20ab624a2c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 15 23:16:09 2010 +0000

    no more print in storage unittest

commit c12e0c1821bb96aed1a4ededb4a1241975f1dbcf
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jul 15 18:13:48 2010 -0500

    reorder imports spacing

 HACKING           |    1 -
 bin/dhcpleasor.py |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

commit d979c3c7db9b3a5852336e9d2ded06adeef0497e
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 ------------------------------------------
 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 -
 7 files changed, 5 insertions(+), 95 deletions(-)

commit cbc1872bb99c96be4983a7dd7d50e1b927aaa931
Merge: ee40b63 674aff6
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 15:58:34 2010 -0500

    Merge with trunk.

commit 5da3efb23dba2db704b7ba33b0aec1405fd401d6
Merge: ce021c5 ee40b63
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 15 20:25:49 2010 +0000

    merged trunk

commit ee40b63dab05cefdc61e463a184a668f132a851b
Merge: ce021c5 7aeaf8c
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 7aeaf8cf641df567cb1b1a818621e979426db0f2
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.

commit b69e3121c3070d3eb9c8c4eba9c6058d9803d843
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 ---
 docs/conf.py |    2 +-
 run_tests.py |    2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

commit ce021c5778a0acd4afc0d5e0ac0bb814be97a1a5
Merge: af8bd6c f8952ca
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 15 10:52:11 2010 -0500

    Merge with -core's diverged trunk.

commit f8952caf4ae0be977a198d6f44faf40b2d6d6309
Merge: c4d8cc8 ef4a479
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 15 14:07:51 2010 +0000

    Updates the test suite to work.

commit ef4a4791b7719e81f65551b044803a9f0e30f65b
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jul 15 08:44:25 2010 -0500

    Disabled a tmpdir cleanup.

commit af8bd6c7d4625da0d3bfcd47fe54e5aa5e415861
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 01:31:16 2010 -0400

    remove vendor

 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 -
 1758 files changed, 0 insertions(+), 420343 deletions(-)

commit d9b14f8c5a962c46b93f2e748662f92e0b6e8580
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 --
 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 ++++++++++++++++++
 run_tests.py             |    2 --
 setup.py                 |    2 --
 24 files changed, 79 insertions(+), 75 deletions(-)

commit f09e0d78703c62bbc17790b32adbad69cf52fe57
Merge: 54936d1 2ca91f7
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 22:11:48 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 54936d15a204c8d5b8fdb5d564134d41051a8e7f
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.

commit 2ca91f7234c7a5d2f5cd030240aa6e0f90328557
Merge: 60d93bc 8c2a925
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:48:44 2010 -0400

    Merge branch 'master' into rackspace_api

commit 8c2a925dfcda882bc102fa477f4aba81ae5d4a72
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:48:02 2010 -0400

    bin to import images from canonical image store

commit a5d530de99e56fac0a738c56753a362a2e891e5d
Merge: 3e23110 5d64230
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:31:28 2010 -0400

    Merge remote branch 'origin/uec'

commit 3e2311073d8c1390b49dd89845203ca46d49be58
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:28:30 2010 -0400

    add logging import to datastore

commit 574ac3c6c177c99b393174bd3a8920cc42d3fdc9
Merge: cd40cb6 4486c71
Author: Todd Willey <todd@ansolabs.com>
Date:   Thu Jul 15 00:21:17 2010 -0400

    fix merge errors

commit 4486c71b2b694935bfbbe2ec06ebb753051d3ec2
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

commit e27a6b22ddf143472ad0cb4cd17c49a4feb10d6b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:51:52 2010 -0400

    fix reference to BasicModel and imports

commit fa10586d3e358d24a4fe7bdcbd636956183cf869
Merge: dc8eeb2 e08c6e2
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 e08c6e230b3e8ba8e06abd2d676529b579298940
Merge: ee86c4b 7dc7865
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 ee86c4b52f8cef97ba69ad5a3e9996a9ed129d9b
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 23:34:10 2010 -0400

    Cleanups related to BasicModel (whitespace, names, etc).

commit 7dc7865b6413abaa16a3532347393024625eaa18
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 19:55:52 2010 -0700

    Updating buildbot address

 README |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit 3d82eb157b88517007c3bc019953b298bbcd1195
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 19:35:13 2010 -0700

    Fixed buildbot

 README |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit 5d642308b484712b6f0f0435c4fbf8f432c0031b
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Jul 14 21:26:10 2010 -0500

    work on importing images

commit d1fd04b13f69e15a2e8e81a2a71b2b686fd66cac
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 22:02:15 2010 -0400

    When destroying an Instance, disassociate with Node.

commit d2ff39bd710cc51fe5b44accdfeb5ad3295debb5
Merge: eb26438 301ca6d
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:55:45 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit eb264386ce860ad7f4170dc6d231f44d0fc50ec3
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:55:37 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 51e4f1eb029ffce3c4c2fe609fa615653d0c6950
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:41:45 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1aa426356560904fd4adf1f444eb030a0f2b65e1
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 18:39:48 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 02c08e4026f99c091ef8b92c3502353f6f249b46
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:18:19 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit f217d0e4ad1b2526d22fb1b93a89cdb6edd6e5e3
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 20:14:25 2010 -0400

    Move BasicModel into datastore.

commit 3c32bd7b1e0c913c79f17a52fd85c7dd050f2603
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:13:02 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit bc674bc3a63fc6a878e2f2066e3214f1e5e18ee0
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 17:07:37 2010 -0700

    Smiteme

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 3cda29bac90be0cb1c836245f03fc3d90ac3f956
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 20:04:49 2010 -0400

    Whitespace change.

commit 3a0421e865fad650c63763c10d2a81d2e62d05fd
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:57:41 2010 -0400

    unhardcode the binary name

commit ccc522b1fbc409132635b0095929dd6956069e60
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:51:57 2010 -0700

    Fooish

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 8bf9313d893b3fc23d724bdbca8e33f99f133393
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:51:38 2010 -0400

    Finish singletonizing UserManager usage.

commit 301ca6d6c1c056c9f1f0d478bdf1184d7e3dbbd3
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(+), 0 deletions(-)

commit a72529127ef04b4e02f3698f4ac7a018538c33ce
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:39:56 2010 -0700

    Foo

 README |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 8e9231e2ed2d83c289afe1f7a4286129f6c0a5d8
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:38:41 2010 -0400

    Whitespace fix.

commit 8a947a010cb077a3ea8116e29242834a3eedb8a9
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:33:12 2010 -0400

    Remove debug statement.

commit 12ebe2205f65911f64c7be416ee7cc79d1c1856e
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:32:11 2010 -0700

    Foo

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 64e6ff254c2aece1ee0427bd2044f677c291e1df
Merge: 3683e02 918fe31
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 3683e02364935a5c1b7cf0c38e6c1f8d4930a081
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 19:28:57 2010 -0400

    fix a typo.

commit a746532e76c41b958464633137e84afca7805e8b
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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit b0078dc6146a0d0fa4725b2b7599d1e57fc43855
Merge: 5a3bc75 c30ebc4
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 5a3bc75d110fa51b2802b2995c59e9535da92b55
Merge: e521c44 f09d8b4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 18:16:24 2010 -0500

    Merge remote branch 'origin/master'

commit f09d8b4df1ab33658b441b150c549786e11de0db
Merge: b53ceac 43057df
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Wed Jul 14 18:03:42 2010 -0500

    Merge remote branch 'origin/master'

commit b53ceac533989bc5d3871c2f0b47c198ae4dee72
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

commit 43057df4ba98232aa1a7a12f09884337a5380b6f
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 16:01:09 2010 -0700

    More buildbot testing

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 10c68656a30b447454cb90156d6a11486981b4b3
Merge: 78435ce 8d6ca1b
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:59:23 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 78435ce1e509e293fc5b4d3fd3bf374c1d49a582
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:59:15 2010 -0700

    More buildbot testing

 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e521c44975b7ef3501fd147c061c5e7590ad7845
Merge: 5e8ffae 8d6ca1b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 17:53:25 2010 -0500

    Merge branch 'master' into simplenet

commit 8d6ca1b92573ec667f8f5bb159c08df55ad5712a
Merge: c9009b6 783b216
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 14 17:51:59 2010 -0500

    Merge remote branch 'origin/master'

commit 783b2160539cde0a7e570f62c9d2c3b4133b13ac
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:44:42 2010 -0700

    More buildbot testing

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 1255c1265677d681cd4456c147de0ec869230275
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:42:32 2010 -0700

    More buildbot testing

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ac67a75a1a99d2b91f6c7cf88db1e994c2c71677
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:41:02 2010 -0700

    More buildbot testing

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit ae5138b713bef6b8f7ae2bc2cba164b6e4d32c41
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:39:24 2010 -0700

    More buildbot testing

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 4dead145c4f9619e8df4063212b0bb3ddbd3713b
Merge: 2b9257a 0b87da1
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:34:56 2010 -0700

    Merge branch 'master' of github.com:angst/cc

commit 2b9257a2015ad91086a3cabf4ffde2201294a9a5
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 14 15:34:46 2010 -0700

    Addin buildbot

 README |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit c9009b673159edb42ffd8eac6807f2f05181d060
Merge: 0b87da1 75483e8
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 9399a7502f7ddcd5959a015b92d35c74528139f5
Author: Todd Willey <todd@ansolabs.com>
Date:   Wed Jul 14 12:43:57 2010 -0400

    Fixes from code review.

commit 0b87da11a3564a550e1ed7a62c857ff5fb9a2d73
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 13 19:01:14 2010 -0700

    release 0.2.2-10

 debian/changelog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 3168970dc1421320503b5eb626e675ba922a3910
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jul 13 20:52:13 2010 -0500

    fix for extra space in vblade-persist

commit 75483e8db0f793861de490138f06f4236ae633ed
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).

commit f2e77e6fddf947d8d4d7e87984a12e7a9c0ee85b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jul 12 13:23:22 2010 -0700

    release 0.2.2-9

 debian/changelog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit b60193d95e0f79638a1f1363ea879a63e80353d5
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

commit 811985e564d82b767bee7d7ad7c247ea734af5b0
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 12 10:39:01 2010 -0500

    Move nova related configuration files into /etc/nova/.

 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 +-
 11 files changed, 11 insertions(+), 9 deletions(-)

commit 03614db9d276f84b29fcca772e4a63fa37d7e68d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 9 16:17:45 2010 -0700

    move check for none before get mpi data

commit 177eb070b238362361778b5073f5553ef0eca398
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Fri Jul 9 08:21:32 2010 +0000

    Refactored smoketests flags

commit b6e775789d7b9eb7cd032dcd34ecafd9ca6cb51e
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 8 21:48:43 2010 +0000

    Fixes to smoketest flags

commit 570abff6eb2961c21330d58e02cc8839aa283bba
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jul 8 14:05:45 2010 -0700

    Minor smoketest refactoring

commit dc8eeb210af2660e05d6b42d36808200c02a166c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 12:19:50 2010 -0700

    fixes from code review

commit ee217a3af260c6d7d1b769743ebbbd4b5114cee7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 11:03:43 2010 -0700

    typo in exception in crypto

commit 7a9bb6265f07711babe52d5d15bbae9562ea1da6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 11:00:53 2010 -0700

    datetime import typo

commit 535ae2b73777a1dc0ffa97f2e3a1fcb999e57a7d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 10:53:27 2010 -0700

    added missing isotime method from utils

commit 4b2a4edc49196fef174174dc598cb8c64a6ac33c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 10:06:25 2010 -0700

    release 0.2.2-8

 debian/changelog |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 7a07b79f59c4284790844c13ae862e9e42496491
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 8 09:42:11 2010 -0700

    missed a comma

commit cbdacfb5f00b50f1e9d07f8143e3827d78d6756c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 18:45:41 2010 -0700

    release 0.2.2-7

 debian/changelog |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

commit 389a72254fe882bafeff40abf570a64008a70d93
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 18:29:19 2010 -0700

    use a flag for cert subject

commit c30ebc42264a81b5f7a65dd512dc385d9ccaefbf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jul 7 12:25:22 2010 -0700

    whitespace fixes and header changes

 bin/dhcpleasor.py |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

commit fe0ea63ead12be7c9c3e1e991a38773455d312b6
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:24:24 2010 -0700

    Fixed the os.environ patch (bogus)

commit 1c312375745c89d197228b501b3bf08f632633eb
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:24:22 2010 -0700

    Fixes as per Vish review (whitespace, import statements)

commit 235d97aa48231aa47fc5c809a6df896b14f1d230
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?)

commit c0e1b177fa32cd379f3f00a52afdac59149c7e92
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Wed Jul 7 12:15:11 2010 -0700

    Adding more tests, refactoring for dhcp logic.

commit 11d6d1bb6ef4c11f6e023cc3859b9c04f6062a09
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 +-
 2 files changed, 28 insertions(+), 10 deletions(-)

commit 141b794fa532586ddc9a419985346482d5181fbf
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 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

commit bec2499e1389d8ea8a5be9652589d23ec3cefc55
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 deletions(-)

commit 7384fa067266992c37147fdb91af297df3bdad5e
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 983d805bf9fe66b32210cc73e6483824e59ac523
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 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit dd6e4ea6e91759d6cb284c1e1f722728ebab9b20
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.

 debian/changelog           |    1 +
 debian/nova-common.install |    1 +
 debian/nova-manage.conf    |    4 ++++
 3 files changed, 6 insertions(+), 0 deletions(-)

commit e5ab28e5bc482cc21a4a09f4541a36c8cf39bed4
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(+), 0 deletions(-)

commit e81c5d2b98a4396bd22aca23d5bf9822142b92a5
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 deletions(-)

commit 6439554e3210785e63ed6e022dbf3b84c00589cf
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 files changed, 2 insertions(+), 2 deletions(-)

commit b688a33d87244a0616344a4ad617527a40d097e1
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 deletions(-)

commit cf5462ef42f4ab1d657fe254aeca32c05333bb4e
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(+), 0 deletions(-)

commit d45ef651d8ed66052c0252435ad0f0784f36c6a2
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 64a792550d197bd6f5cd006ea287c3869b17b63a
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Mon Jul 5 13:35:16 2010 +0200

    Fixed package version.

 debian/changelog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7c2cd2f17241eec414516367df98d1370e66363a
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 5dd4e0726cc117326b85ece8ae38e1cfc99f334b
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(+), 0 deletions(-)

commit 09f86994da02a04e83370438d9bce9203eb2e3e4
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 files changed, 6 insertions(+), 0 deletions(-)

commit e6b4373d6679c85b4f79d4a69aa1d855ef4d1707
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.

commit ea6ce3fd60c9b986c8a64ace7cafdc98446bc493
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 5e8ffae442010ea89d5ffb3b4f42486a02cb3037
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Fixes and add interface template

commit 434f66f5dcfd3ab06573608ea754ca184149559c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Simple network injection

commit df8ff8b5ff9e03cb1f277b96ebfa8d2605d634a9
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:39:04 2010 -0500

    Simple Network avoids vlans

commit b815d31256bf25c5f9b4f852585ca2aeb4be9113
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:38:15 2010 -0500

    clean a few merge errors from network

commit 918fe3119480acde09453b406d9e8f45c7832bb3
Merge: 2cbe407 85a4e23
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:31:44 2010 -0500

    Merge patch 30001

commit 2cbe4071270c21d3e3ab51cba07651cb3eabbcc8
Merge: 10fb9a6 5133e94
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:29:55 2010 -0500

    Merge patch 16002

commit 10fb9a67ea64006f4dfb2c065b2c52494affbbc8
Merge: 818acba fb10732
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:27:59 2010 -0500

    Merge patch 21001

commit 818acba12720de702f31755ee877a92d5a5e64c6
Merge: 429f85b 283adbb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:25:56 2010 -0500

    Merge patch 28001

commit 429f85b45cd5e7d538a26c73025a204098b14cd3
Merge: ea82740 4d681ce
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:23:57 2010 -0500

    Merge branch 'describe'
    
    Conflicts:
    	nova/endpoint/cloud.py

commit ea82740ed8ef43fb1bf5a66a1e8889707252f90c
Merge: a06a412 175155b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jul 2 10:22:22 2010 -0500

    Merge branch 'vpnkey'

commit a06a412df45836943ac71d0030b7dc7087ed061f
Merge: d5791ac 0945ae5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:55:41 2010 -0500

    Merge branch 'extra_reference'

commit d5791ac606db765bfc2d0ea64778916926d30dc1
Merge: 4e222ec 0187796
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:51:32 2010 -0500

    Merge branch 'comment_fix'

commit 4e222ecbe78a69d8af6a9c379e35799c84823b42
Merge: 46c7384 aa0b47f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jul 1 17:41:57 2010 -0500

    Merge branch 'master' into fixrbac

commit aa0b47f68423c428087acc0f1ae26c86d9388f01
Merge: 04ed6c4 c4d8cc8
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 22c40f6f3a52af5262ba47bf6ea5802c86e2cc05
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 files changed, 1 insertions(+), 1 deletions(-)

commit 6a3ad65731830d274280bcdca04861145310713d
Merge: b635c85 c4d8cc8
Author: Soren Hansen <soren.hansen@rackspace.com>
Date:   Thu Jul 1 13:13:52 2010 +0200

    Merge with trunk.

commit c4d8cc8dc180557027760dabdad09398dc4d5925
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 15:07:52 2010 -0500

    getting started update

 docs/getting.started.rst |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

commit 04ed6c49b34b53f44f5f6e6d55d1e14db3b8f5a8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 15:04:23 2010 -0500

    getting started update

 docs/getting.started.rst |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

commit 9385dea3a21705fab0ace9efb47c19d3c3217e61
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:24:41 2010 -0500

    Remove _s errors from merge

commit 911f263be9842cb358654d55e6db088047d7aa0a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:17:56 2010 -0500

    fix typos in node from merge

commit 7d1c41fbda908bf0b10690e247f678e1efa78d4c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 30 11:16:54 2010 -0500

    remove spaces from default cert

commit b635c856c16aef0dceee6111708ab67cb62b1442
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.

commit a554d24165e20c9f32d5948cd7a4743dcc6a2813
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.

commit c0c8d9f886df03bf0197e4024ec5dd0eda59c73e
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.

commit 3b4a8a00e09302661543ade09ce7f68e3dcdfc58
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 files changed, 101 insertions(+), 10 deletions(-)

commit 446d5feb6b367fc389a1d7fcde9421c9516671f8
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 bccdd97c8e72a0245d791ef70d1b83737b1d9507
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 21:25:59 2010 -0500

    Removed trailing whitespace from header

 builddeb.sh  |    2 +-
 run_tests.py |    2 +-
 setup.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 67d5a5f68772448e6cea5627612718b7596f35df
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 29 21:25:39 2010 -0500

    Updated licenses

 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 +++++++++++++++-----------
 run_tests.py          |   23 ++++++++++++++---------
 setup.py              |   31 ++++++++++++++++++-------------
 17 files changed, 260 insertions(+), 189 deletions(-)

commit fed4a9d749216245c1706139f374901810b46a44
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 29 21:23:29 2010 -0500

    Added flags to smoketests. General cleanup

commit cd40cb6ed550894f4114bf14defc139f07543b50
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 18:02:00 2010 -0500

    removed all references to keeper

commit 875edb8448f9e3e09c4dfd70df16c1b681f45b37
Merge: c91cf30 dc7b9fc
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Jun 29 16:59:07 2010 -0500

    Merge commit '56443020bcd20894c13eb73bd04a0a5eab4ba960'
    
    Conflicts:
    	docs/getting.started.rst

commit 69452e71aa1e35992325dad3556a33208a5c69e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 14:27:55 2010 -0700

    reformatting

commit 46775c2926a72878ffa2b6ac9c83a9a9805ec24c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 14:01:13 2010 -0700

    Vpn ips and ports use redis

commit 5133e94f648cf18dfaa94bb21ddb8ced7ec711a2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 08:55:27 2010 -0700

    review reformat

commit 85a4e23e6babe2fbec236f930be466053edcdebc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 29 08:46:10 2010 -0700

    code review reformat

commit 040c7735a677783b467bfd357c7ecb7b528adf43
Merge: 756c9cb e54085c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 22:47:02 2010 -0700

    Merge remote branch 'angst/apply_api' into diekeeper

commit e54085c79bdc6dfa14446e8291f9153f2af9db88
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).

commit a204e8a95a18cec8087b4e739e7b07a612f53fc4
Author: Todd Willey <todd@ansolabs.com>
Date:   Tue Jun 29 01:02:48 2010 -0400

    Get rid of RedisModel

commit 756c9cb7313670a6ec178ccfd728967769fecc04
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 20:31:06 2010 -0700

    formatting fixes and refactoring from code review

commit 34af45b67ea439a54440ad3308373e7338c65d7f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 19:52:06 2010 -0700

    reformatting to fit within 80 characters

commit 626b21db0ba1cb4cfe7f223cba26211da04228bf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 16:01:09 2010 -0700

    simplified handling of tempdir for Fakes

commit d90b78ad76445ad9e2a38f7f8dd3454540fa0e22
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 15:36:59 2010 -0700

    fix for multiple shelves for each volume node

commit 289cb131a7f2b777cf4d64dad848b896d944639f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:09:54 2010 -0700

    add object class violation exception to fakeldap

commit 60d4da3cfc0182f50499d78b9a59d94e6d930cd8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:09:01 2010 -0700

    remove spaces from default cert

commit 9c739a04d12ce65d701044adb473a92d700a6928
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:08:24 2010 -0700

    remove silly default from generate cert

commit 278a0680a4c771fb7e740a56cb74299b05b2626c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 28 14:00:56 2010 -0700

    fix of fakeldap imports and exceptions

commit 3a82b82f2c9967792571556bf09825960190f25c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:47:04 2010 -0700

    More Comments, cleanup, and reformatting

commit 46c738400eaeee80a0b901d691ab40263ba4679f
Merge: 3be7bf0 20c91f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:21:52 2010 -0700

    Merge branch 'master' into fixrbac

commit 4c100c2a4e07124494ec58a09e1da5bb763bf6f5
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:20:38 2010 -0700

    users.py cleanup for exception handling and typo

commit 0298df9d8413d20f1fc2ed60388480e472738afd
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 23:19:14 2010 -0700

    Make fakeldap use redis

commit ed614929c3dd465824d71ce53a042dd7dd5e150c
Merge: 20c91f3 3be7bf0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sun Jun 27 22:56:47 2010 -0700

    Merge branch 'fixrbac' into fakeldap

commit 8844d8bc766eed26c816ce83c2ddae2eea6628f4
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.

commit 979fc73e304f120c7063912fd5fa3f66faf70f2a
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.

commit 283adbb603966c4f33556645a3f1833ba1e123f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Sat Jun 26 14:50:33 2010 -0700

    fix key injection script

commit 19fa09655148baf224c1974560c6629ecfaffb05
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 25 22:03:45 2010 -0400

    Fixes based on code review 27001.

 run_tests.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit fb1073234a6d380baa4fa9ceca30042d42957e23
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 17:36:48 2010 -0700

    added TODO

commit fd48be0860d77c3dd0d0fe19758d1845bbe4253d
Author: Todd Willey <todd@ansolabs.com>
Date:   Fri Jun 25 18:55:14 2010 -0400

    Admin API + Worker Tracking.

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 175155bf428ba00e514a00c6c3f6390fe13dff39
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 10:15:42 2010 -0700

    fixed typo

commit 3be7bf00fdddb1183531bab674ddc901e4435f11
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 25 10:09:21 2010 -0700

    style cleanup

commit 83bd0149bdc388b596a408e54d76f9b3163653b8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 21:17:23 2010 -0700

    add more info to vpn list

commit cccb22e78faf94727e9d902e3947c90b29203b82
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

commit 36553b44706fa7e44a7bb5eac9db2b536ba033a0
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

commit 20c91f3703629a065ad6df0fa86bc01ac52884ad
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

commit 4d681ce441372e150650d5bf1d31a3e58058eb32
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 11:16:11 2010 -0700

    Placeholders for missing describe commands

commit c7dec32a38ee13eb2fe0c4a56e3776a517c09df8
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)

commit 0187796ddfd7f4b7a746d6506dcd2bbff735bf99
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:50:33 2010 -0700

    more comment reformatting

commit 5a53d319a86cb90d774901fb25e95a65033e3796
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:30:14 2010 -0700

    fit comment within 80 lines

commit 0945ae5f25201edeb964c2e67c309d19e981e9f6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:28:32 2010 -0700

    removed extraneous reference to rpc in objectstore unit test

commit 2842a966256415a30bc4fb314a22bf47077ddb8c
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

commit 6e441e2e3dfd4797582b4382a1a73d6af1ca4c18
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

commit bf061a8814831430cca6d7309f275d4eb2f07367
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:16:25 2010 -0700

    Fix error message for checking for projectmanager role

commit 5f01b982990aa55437eca88939281e6f8b06ce16
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:16:25 2010 -0700

    Installer now creates global developer role

commit 5f9e609738228a334771dc12b6053de5c64ba2e6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Wed Jun 23 23:15:06 2010 -0700

    Removed trailing whitespace from header

 builddeb.sh  |    2 +-
 run_tests.py |    2 +-
 setup.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 1e885f4aa521504047e34987da0f766e7dda627c
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(+), 0 deletions(-)

commit 7e708a1e19b6176d1485f6a19f00402fbb4d4f03
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 22:04:16 2010 -0700

    Updated licenses

 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 ++++++++++++---------
 run_tests.py                                  |   23 +++++++++++-------
 setup.py                                      |   31 ++++++++++++++----------
 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 +++++++-------
 43 files changed, 497 insertions(+), 422 deletions(-)

commit 336a74a9880e9c7bc8be5fc5a253ea3787985bad
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 21:19:08 2010 -0700

    Added flags to smoketests. General cleanup

commit dc7b9fc405ed2cba8c9fa55709f6dfe5bf0338df
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(+), 0 deletions(-)

commit 913e5142ec14de6e7a3903ff3cc05127c01ea7da
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Thu Jun 24 04:12:01 2010 +0100

    Tweaks to get instancemonitor running

commit 13e57df254e8ab6dc1430994efc69695510e2a85
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

commit edbec9f6a34eaaefd1afce04b8e18ed9d95de078
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:01 2010 +0100

    Create DescribeImageAttribute api method
    
    Conflicts:
    
    	nova/endpoint/cloud.py

commit a042acdf8f4674fd4741ea817042c02d18bec0b5
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    release 0.2.2-6

 debian/changelog |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

commit ffdcdc3a61b918f50d7d45f2bf43e0f4a5e6e435
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

commit 25b59564c2da4bd4b7974a6171dbc58467cbe64a
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    release 2.2-5

 debian/changelog |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit b69239ab76380737f5a128c5c313771b0f757e25
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

commit 49d1da8dcd1ffe24d725279b2146ed8b412864c6
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 deletions(-)

commit f0dce8d316019a2f6991c588cead42a79540c542
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 77d87947e768c3d1b3e8b83c4a603302fd277027
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    trackback formatting isn't logging correctly

commit 83f2945772d72775d0f754775214a613f30ae352
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:12:00 2010 +0100

    documentation updates
    
    Conflicts:
    
    	README

 docs/getting.started.rst |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 02f53e87353e0407267004ef312ca143fc94dad3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    fix missing tab in nova-manage

commit fc5828bc7ca70b6b96397de90ee1c531ac9b0f48
Author: root <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    Release 2.2-3

 debian/changelog |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

commit 9f31a0c068d020c353dcb36bf3ca7d084d2e5481
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    use logger to print trace of unhandled exceptions

commit 6999f00bed97bf16b2629f3c09dbb3a10c47768e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:12:00 2010 +0100

    add exit status to nova-manage

commit d29ffee1d1824f7cef283a1be355a3f6430d8888
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    fix fakeldap so it can use redis keeper

 run_tests.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit 0821766a9942659127ca4fb5c174f81142a4952f
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

commit c65fa7f9aedf51ac10caff4f3e638b05714a59bb
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

commit 48f1dca7e566fc298c8bf0bc5def13c081767cf7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    More volume test fixes

commit c42d9064e4b038c656288fb810ae195d98269d38
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    typo in reboot instances

commit ab529969e790bfadc61eb439d204f953c0cd935b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Fix mount of drive for test image

commit 30467e890757b5740175eb855293a4ab019c2c46
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    don't need sudo anymore

commit 32b473b0e5ce09ee20620a5e161a5915a60566e2
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Cleaning up smoketests

commit 063a276ca658eac2fb8a2e369b4d7a0a7231c9a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    boto uses instance_type not size

commit 1cba847a1cc4bab7d16ba515e76ed687ce4d6923
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:59 2010 +0100

    Fix to volume smoketests

commit 6f6716b796a3053071ccca1a5ac253f535082008
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

commit 5d5fe5415948bbace815bd192e7b3f5ad58573f8
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

commit f476bb26f734520367b95cacaae96beb201b4eb0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    fix error in disassociate address

commit 10cf17884d688da5ffb363632269aee462d5a504
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    fixed reversed filtering logic

commit 3a9fac2187a1e3604e6c80ce8262b80df0acb8eb
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    filter keypairs for vpn keys

commit 671c752aa84238616440a95af9e5a07abbd80ae0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    allow multiple vpn connections with the same credentials

commit 8c696c4237ab60059d1789cbd445057063cce448
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    Added admin command to restart networks

commit 508b63dffcf91a5aae15c1b764ffb7e1d0fc773c
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

commit ce2577c031ada423318b16da9af83c854c4d8cc4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    typo in my ping call

commit e473c4d2969828b3470729b6cc205edc375c57d6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    try to ping vpn instances

commit 714c076f0c996d69517010b2e58da0cba6d2866b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    sensible defaults for instance types

commit 3b3f08f35f5c69ea6745582d095602c78fea7707
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    add missing import to pipelib

commit e0e4811f6dfb8221b1bfe4b722c822cf57b502f3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:58 2010 +0100

    Give vpns the proper ip address

commit 885bb5d2f63266caa0eb1ce5ac519fed41b9fec1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Fix format addresses

commit f9b1bcdb6c28e7b6c1499e6c24378d455a4399e8
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Release 0.2.2-2

 debian/changelog |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 7b5436aaa0e9b80ecca6e28d8a2bee8a3f9e0d05
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix more casing errors and make attachment set print

commit 50174b75a671cc90d16164266a00efad292962a1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    removed extraneous .volume_id

commit bc5d29ec4306fab0ec80d17d00dd6def4d63aa09
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

commit 33795075a0c28b484594eccf41da57642ec7001f
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix case for volume attributes

commit bc1c71a0c482dad8a613e14e62fd40c3f2eccee6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix sectors off by one

commit dd578ce512146b65b9492536e82482ef800faa04
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Don't use keeper for instances

commit 38d00e10ad9ad8715645fad5c27722fb650a5f35
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix default state to be 0 instead of pending

commit 423b97d94a1decf0fc4dd9a3df7fd0be1f06470c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Release 0.2.2

 debian/changelog |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 63077f4fe20b8d521a07fe5cd8158000d89677fa
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    Fix for mpi cpu reporting

commit 0aa70cd3870b18283f4abdda82d38420891921b1
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:57 2010 +0100

    fix detach volume

commit 71ccb795405be282e0c193768f47376415a425bf
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    fix status code printing in cloud

commit bf87526691958e120b77f681498528c354e8b2a6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    add project ids to volumes

commit 351919f356622fe0453ec53b1ef2c90891f29fd9
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

commit ea0490acfe29e8f146ab844d314efba8061a8165
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    whitespace fixes and format instances set of object fixes

commit ac84be81f763a026a4253019f90eebea4020c4a4
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Use instdir to iterate through instances

commit 4952146ad2dea60e0b8e85b09597292dd2d60f80
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:56 2010 +0100

    fix bridge name
    
    Conflicts:
    
    	nova/endpoint/cloud.py

commit 97cfc56f4dea750031e28f1587d3425947028863
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.

commit ac97185fab4432a055a9bce14228a543c580425b
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    finished gutting keeper from volume

commit 13b3666df63b32ef4f95994d0be92c630cad0109
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.

commit c69636726ef0221dcfd98b2a3c645166a5fb4374
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Removing keeper sludge.

commit add107ea3ed04589638338a28bac5d29d0ecb1b7
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:56 2010 +0100

    Set volume status properly, first pass at validation decorators.

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 0f8a1c6f2c5cdae695a66e6df4439e6e31b7b1d0
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.

commit b9d6a37e4991586453973f482094c46afd295691
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    one more handler typo

commit 2e782fc95522c54b5af6b94feb8ce02cce3e32ea
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    fix objectstore handler typo

commit 2b4bb542d11155fc47477faacc6b889792f180f9
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:55 2010 +0100

    fix modify image attribute typo
    
    Conflicts:
    
    	nova/endpoint/cloud.py

commit 2788a030adf593b9c35efcf4b46fb24ff4d8425a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    NetworkNode doesn't exist anymore

commit 5d3a83ccca354ba1f81f65de4a5322e9e7333372
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Added back in missing gateway property on networks.

commit cb1a762cfa82ba842a3b1fa26deb4b278420c453
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

commit fa646f24ba0a2052fdd9942464f230543ab66a24
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Delete instance files on shutdown.

commit 126ad0985caa718231dc6874eaf788ca24699aec
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    Flush redis db in setup and teardown of tests.

commit 48e7f827e5b6e590cd073f3d8f53c3298cbf65bd
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, 0 insertions(+), 0 deletions(-)

commit 65f9c86deddbdd043a6715150bb451bb34dd90dc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:55 2010 +0100

    change pipelib to work with projects

commit 80bf98c5c26e442da05524176d50bab08a6132f1
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.

commit daabb5020405e2497dd90735b777728ad692f2a9
Author: Joshua McKenty <jmckenty@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Adding nojekyll for directories

 0 files changed, 0 insertions(+), 0 deletions(-)

commit b5f7149ff0e527a76c43989257e139f803588b1a
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.

commit 5d0395007148d8875ea0a61da3f13193682de9a9
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

commit 95867b92a2fcc5841b2b7a1d9bcba4cdb6027d7d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    nasa ldap defaults

commit 50bb0d358fac7a8d4a4af0efb9ce157998db4ba8
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:54 2010 +0100

    sensible rbac defaults
    
    Conflicts:
    
    	nova/endpoint/cloud.py

commit e67301cf7fc0ce8e09051ff2b977fc05d3d35753
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Tests for rbac code

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 318b2c9e2a141054f238b4e0f013072b6f20c402
Author: andy <code@term.ie>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Patch to allow rbac
    
    Conflicts:
    
    	nova/auth/users.py

commit d0d5a5a4bf6350d5420f239662d34c08769ca4fc
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    Adding mpi data

commit 4112161feb29e52d2db26e597835c6ee3344e9ba
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

commit 1e15f9254e0c4fe20a38de014128c37017fed588
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:54 2010 +0100

    how we build our debs

 builddeb.sh |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit c2740ec74ceede9299dc44023e948f96e06a6570
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.

commit 8c7baf8ea6c4aa05930971a52d111a2d300aa198
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 +-
 debian/changelog           |  127 +++++++++++++++++++++++++++++++++++++++++++-
 debian/nova-common.install |    1 +
 3 files changed, 129 insertions(+), 5 deletions(-)

commit 4a032d60eba12c54553428b75b83bbf08358873c
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 04:11:53 2010 +0100

    devin's smoketests

commit 80e4a1edfb4d4aa808f589380d5b3b8ec6ec0684
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

commit 36a656d9c3dca8f460ef8a679b1e0781d55a298e
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Thu Jun 24 01:46:02 2010 +0100

    fix a bug with AOE number generation

commit 2d24b0b5d11fa1aa9891866b15cf57c9043bc500
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Wed Jun 23 12:18:36 2010 -0700

    Initial commit of nodemonitor

commit 5e05ed24fc1108cd0ffd8fa93aa3f8d1a0f60893
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 22 21:42:58 2010 -0700

    Create DescribeImageAttribute api method

commit 2e60c17d47eff22588c6b568f143bea6fbd643aa
Author: Devin Carlen <devin.carlen@gmail.com>
Date:   Tue Jun 22 21:36:37 2010 -0700

    Create DescribeImageAttribute api method

commit 60d93bc6e8af15fec31f372edc290b5a7dff755e
Author: Todd Willey <todd@ansolabs.com>
Date:   Mon Jun 21 12:44:39 2010 -0400

    More rackspace API.

 exercise_rsapi.py |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

commit 8de4ab60971831be509df0bdd311f508db527e07
Author: Todd Willey <todd@ansolabs.com>
Date:   Sun Jun 20 20:18:56 2010 -0400

    git checkpoint commit post-wsgi

commit 5eb9bca481c0a1e6b46f1cb6b1473d4e50898a3a
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:09:58 2010 -0700

    update spacing

 docs/getting.started.rst |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

commit 4cfbaf641848129f3ea4a6befc4189cc9429f6e5
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

commit 1a8061bfa687e7245fd5251d232f53e138255536
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:09:17 2010 -0700

    update twitter username

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c564d710db75dec96bc64f6fe1611a6098d9ba4f
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 files changed, 3 insertions(+), 0 deletions(-)

commit d979259445b3175efe98ebc4cc406276172770bb
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 files changed, 4 insertions(+), 1 deletions(-)

commit b5ff20590ef789408f55eaf233ba1bbaa88a5e59
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 files changed, 24 insertions(+), 3 deletions(-)

commit f83ad52a13f168f6581f66d418b61713dba02eed
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 674aff60a6a4820487926bad5c7e625946636f1f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun Jun 20 15:08:25 2010 -0700

    update spacing

 docs/getting.started.rst |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

commit edeb0f14d6d4d0a9840aa5b2ece9c2a7a8ae3d98
Author: Todd Willey <todd@ansolabs.com>
Date:   Sat Jun 19 22:05:28 2010 -0400

    Commit what I have almost working before diverging.

commit 884575e9bc5482401869eeb8b86982db636813e5
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Tue Jun 15 10:42:34 2010 -0700

    first go at moving from tornado to twisted

commit 2913db366dab81b00468524aaae69329dbbe976c
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

commit c91cf30c14bc2192c85f175387eb926f512f56c9
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Jun 12 17:06:35 2010 -0700

    update twitter username

 README |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 3ba272ab1d729198df19350b97dabcd7463cab1c
Merge: 560e10a 5ab096f
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sat Jun 12 17:05:20 2010 -0700

    Update documentation

commit 9e064e717c59e4c7560bc9072cef5c3fe9cc06f1
Merge: 3d47cfe a252a0e
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:07:07 2010 -0700

    Merge branch 'loop' into combined

commit 3d47cfef1d6b1cc394d4c30866cd0600d6d69814
Merge: 84c9863 1c7c67c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:07:04 2010 -0700

    Merge branch 'deprecation' into combined

commit 84c98637be1b4a4b93a70adbb882a76fa648fe3c
Merge: 0e1c712 fee12df
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:06:35 2010 -0700

    Merge branch '4001' into combined

commit 0e1c712e56a29ac36f5eb55b1a3bbd0d710e3148
Merge: 7fd1ba2 4c3a5c6
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 14:06:14 2010 -0700

    Merge branch 'gateway' into combined

commit 1c7c67c7cea3a3c4ac7a0c491a501493a5af5d8c
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 11:13:23 2010 -0700

    fix for reactor.spawnProcess sending deprecation warning

commit fee12df86d92faef2789fa66d2b1543d98a841ef
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 11:09:45 2010 -0700

    patch from issue 4001

commit a252a0e6ced7f2a6339731ebdd0b4694e5479424
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

commit 3539105f0933ad6187f30bdbe8dadfcbc5d04640
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

commit 4c3a5c6af83f0ccf39ed9227595e65a8dcb031c7
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:46:41 2010 -0700

    gateway undefined

commit 7fd1ba2b5358a5a92140be341a1257125d87c00a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:45:31 2010 -0700

    fix cloud instances method

commit 2671382f1087a24a4db5e78b10bb59a8683d69e0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:45:12 2010 -0700

    Various cloud fixes

commit 9f8ee7c7d1d22a5aa9614ffce7cf0a185dc17dae
Merge: 91cc1f5 560e10a
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Fri Jun 11 10:08:40 2010 -0700

    Merge remote branch 'nova/master'

commit 91cc1f5c531483a4a6271b1395649e2422cd6c74
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

commit 4d6a048ad05b71c98cf7da9026d3b8e1c4898101
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()

 run_tests.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5ab096fc70a25b34e8ee84020d7cf18c6b0fcc01
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 files changed, 3 insertions(+), 0 deletions(-)

commit c5a93d982b061ee771b283714257dc63e64e63ef
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 files changed, 4 insertions(+), 1 deletions(-)

commit fc1ef1d81c1b024b88c6408c1c5d3d99a9827da7
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 files changed, 24 insertions(+), 3 deletions(-)

commit a38a069f1330a72d332fc2be19803897b4db589e
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 161472bf7728fb91e6b27c4aa7b8bd76e7799451
Author: andy <code@term.ie>
Date:   Thu Jun 10 18:39:07 2010 +0100

    whitespace fixes for nova/utils.py

commit 560e10a3dc2fafd1cb5feb8e1165e874eaf096d5
Merge: 424bfc6 c1e6a0d
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 14:36:03 2010 -0700

    Merge branch 'master' into net

commit c1e6a0dce809aea14c2a4754565f0e3a089366a3
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 13:48:06 2010 -0700

    Add project methods to nova-manage

commit e006cadb90990759f9ccb5a91239e7853e122f62
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 13:47:10 2010 -0700

    Fix novarc to use project when creating access key

commit 424bfc675d7435a54b25ba3fb085ec04d3ec9ed0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Tue Jun 1 08:21:31 2010 -0700

    removed reference to nonexistent flag

commit 2e9da64222741e2ad5de22a85cdee8ef4fd8e6f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon May 31 18:56:20 2010 -0700

    Josh's networking refactor, modified to work with projects

commit 69500761c4e6f46f8998a68ae881cec15ce0d9ca
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun May 30 15:21:34 2010 -0700

    Merged Vish's work on adding projects to nova

 run_tests.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 670196d4d9797e5a7a126408a87d8294b6127700
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Sun May 30 14:12:04 2010 -0700

    missed the gitignore

 .gitignore |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

commit a800a8c8530b727d30a1d2c9c50dab704f3916fb
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 +
 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 +
 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 +
 1798 files changed, 421844 insertions(+), 0 deletions(-)