From c49b92e2e1f32cbb32c856ba246ef97026318dbf Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 20 Mar 2013 08:30:43 -0400
Subject: remove some churn

cloudinit/sources/DataSourceCloudStack.py and
cloudinit/sources/DataSourceEc2.py are reverted entirely back to trunk versions
now, rather than the non-behavior change that was left in place.

Also, remove inadvertantly added trailing newline from cloudinit/ec2_utils.py

Overall, this just makes the diff when merged to trunk carry more focused
changes.
---
 cloudinit/ec2_utils.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cloudinit/ec2_utils.py')

diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index 175f96aa..5fa8c5ad 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -61,4 +61,3 @@ def get_instance_metadata(api_version, metadata_address):
     if not isinstance(metadata, (dict)):
         metadata = {}
     return _unlazy_dict(metadata)
-
-- 
cgit v1.2.3