diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2011-05-03 11:05:45 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2011-05-03 11:05:45 +0400 |
| commit | c38871690702ad3b6b39845ae33ee71465a8e95c (patch) | |
| tree | 4354efec324597aab16f50c4cae610edda445d87 /nova/api | |
| parent | e49ef5187491d4143de8d0707595c9fb566d4211 (diff) | |
Moved reencoding logic to compute manager and cloud EC2 API.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 94fbf19ff..187f1399f 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -540,7 +540,7 @@ class CloudController(object): now = datetime.datetime.utcnow() return {"InstanceId": ec2_id, "Timestamp": now, - "output": base64.b64encode(output)} + "output": base64.b64encode(output.encode('utf-8','replace'))} def get_ajax_console(self, context, instance_id, **kwargs): ec2_id = instance_id[0] |