← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/crypto.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/crypto.py
24
24
import base64
25
25
import hashlib
26
26
import logging
 
27
import M2Crypto
27
28
import os
28
29
import shutil
29
30
import struct
31
32
import time
32
33
import utils
33
34
 
34
 
from nova import vendor
35
 
import M2Crypto
36
 
 
37
35
from nova import exception
38
36
from nova import flags
39
37