← Back to branch summary

~justin-fathomdb/nova/raw-disk-images

« back to all changes in this revision

Viewing changes to nova/tests/api_unittest.py

  • Committer: Soren Hansen
  • Date: 2010-07-16 16:09:15 UTC
  • mfrom: (139.2.2 remove-vendor)
  • Revision ID: soren.hansen@rackspace.com-20100716160915-pduf64nx3vjj1uxw
Merge lp:~anotherjesse/nova/remove-vendor

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api_unittest.py
16
16
#    License for the specific language governing permissions and limitations
17
17
#    under the License.
18
18
 
 
19
import boto
 
20
from boto.ec2 import regioninfo
19
21
import httplib
20
22
import random
21
23
import StringIO
22
 
 
23
 
from nova import vendor
24
 
import boto
25
 
from boto.ec2 import regioninfo
26
24
from tornado import httpserver
27
25
from twisted.internet import defer
28
26