Manual merge of develop into opennebula-integration

This commit is contained in:
M.Ravi 2017-04-26 10:40:52 +05:30
commit cb4d96604c
3 changed files with 18 additions and 12 deletions

View file

@ -1,6 +1,7 @@
import os
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.utils.functional import cached_property
from Crypto.PublicKey import RSA