summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-22 16:53:11 +0000
committerGerrit Code Review <review@openstack.org>2012-02-22 16:53:11 +0000
commitbe56fd77ad9cfc221a1fea9e0380cb3a44181bee (patch)
tree1b2097aa82ced33e5401556d90de276eaadb4892 /plugins
parent861c0d9e214aed8ba6633aff56270d05fa69e640 (diff)
parent1fc7c0c534b6b03feaf9be3d7aa0f5b3e4f42a9d (diff)
downloadnova-be56fd77ad9cfc221a1fea9e0380cb3a44181bee.tar.gz
nova-be56fd77ad9cfc221a1fea9e0380cb3a44181bee.tar.xz
nova-be56fd77ad9cfc221a1fea9e0380cb3a44181bee.zip
Merge "Clarify use of Use of deprecated md5 library"
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/glance1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 134840335..a0f263403 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -26,6 +26,7 @@ try:
import json
except ImportError:
import simplejson as json
+# NOTE: XenServer 6 and below use python 2.4 so md5 is needed and not hashlib
import md5
import os
import os.path