← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/volume/storage.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/volume/storage.py
25
25
import glob
26
26
import logging
27
27
import os
 
28
import shutil
28
29
import socket
29
 
import shutil
30
30
import tempfile
31
31
import time
32
 
 
33
 
from nova import vendor
34
32
from tornado import ioloop
35
33
from twisted.internet import defer
36
34