summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-07-18 13:18:16 -0400
committerDan Prince <dan.prince@rackspace.com>2011-07-18 13:18:16 -0400
commit813253e8bea9a8db9c1df45f9aa5e094503a015a (patch)
tree8689a2003bc702f237fceface46df07d302d18fa
parentcf14d867673e944cc0c0d5fc160d2fbcfe56e98e (diff)
downloadnova-813253e8bea9a8db9c1df45f9aa5e094503a015a.tar.gz
nova-813253e8bea9a8db9c1df45f9aa5e094503a015a.tar.xz
nova-813253e8bea9a8db9c1df45f9aa5e094503a015a.zip
Don't jsonify the inject_file response. It is already json.
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/agent1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index 8ec4fb061..288ccc78a 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -114,7 +114,6 @@ def resetnetwork(self, arg_dict):
xenstore.write_record(self, arg_dict)
-@jsonify
def inject_file(self, arg_dict):
"""Expects a file path and the contents of the file to be written. Both
should be base64-encoded in order to eliminate errors as they are passed