diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:30:43 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:30:43 -0400 |
| commit | c49b92e2e1f32cbb32c856ba246ef97026318dbf (patch) | |
| tree | a94d4ac07016710f7ab0723e240878b51c66bac6 /cloudinit/ec2_utils.py | |
| parent | 1c88411ed2692f2dacb0c6e15f27b8dca64e7089 (diff) | |
| download | vyos-cloud-init-c49b92e2e1f32cbb32c856ba246ef97026318dbf.tar.gz vyos-cloud-init-c49b92e2e1f32cbb32c856ba246ef97026318dbf.zip | |
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.
Diffstat (limited to 'cloudinit/ec2_utils.py')
| -rw-r--r-- | cloudinit/ec2_utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
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) - |