diff options
author | Monty Taylor <mordred@inaugust.com> | 2012-06-03 13:03:21 -0400 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2012-06-07 12:15:42 -0400 |
commit | cf34a6015762a82780f86004a76439e1e21340f8 (patch) | |
tree | 16581750173cc7e6e9baa956f5db60537dce19d9 /contrib | |
parent | 281979a7b602b3555617394a468871e8d237acf2 (diff) | |
download | nova-cf34a6015762a82780f86004a76439e1e21340f8.tar.gz nova-cf34a6015762a82780f86004a76439e1e21340f8.tar.xz nova-cf34a6015762a82780f86004a76439e1e21340f8.zip |
Finalize tox config.
Shrink tox.ini to the new short version.
Fix the test cases to be able to be run in nosetets plus the
openstack.nose_plugin, which finally removes the need for
nova/testing/runner.py
Also, now we'll just output directly to stdout, which will
make nose collect the trace logging directly and either output
it at the end of the run, or inject it into the xunit output
appropriately.
Change-Id: I1456e18a11a840145492038108bdfe812c8230d1
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/boto_v6/ec2/connection.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/boto_v6/ec2/connection.py b/contrib/boto_v6/ec2/connection.py index 868c93c11..a0cfd7e26 100644 --- a/contrib/boto_v6/ec2/connection.py +++ b/contrib/boto_v6/ec2/connection.py @@ -6,7 +6,7 @@ Created on 2010/12/20 import boto import base64 import boto.ec2 -from boto_v6.ec2.instance import ReservationV6 +from boto_v6.ec2.instance import ReservationV6 from boto.ec2.securitygroup import SecurityGroup |