You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2014/04/10 21:01:29 UTC
[4/5] git commit: Remove print, fix pricing file.
Remove print, fix pricing file.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/b9b3f087
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/b9b3f087
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/b9b3f087
Branch: refs/heads/trunk
Commit: b9b3f08751d47c611ce4bc8010c4644f6c6a1150
Parents: 6f3a423
Author: Tomaz Muraus <to...@apache.org>
Authored: Thu Apr 10 14:49:08 2014 -0400
Committer: Tomaz Muraus <to...@apache.org>
Committed: Thu Apr 10 14:49:08 2014 -0400
----------------------------------------------------------------------
contrib/scrape-ec2-prices.py | 1 -
libcloud/data/pricing.json | 33 +--------------------------------
2 files changed, 1 insertion(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b9b3f087/contrib/scrape-ec2-prices.py
----------------------------------------------------------------------
diff --git a/contrib/scrape-ec2-prices.py b/contrib/scrape-ec2-prices.py
index bf543f4..54a63e8 100755
--- a/contrib/scrape-ec2-prices.py
+++ b/contrib/scrape-ec2-prices.py
@@ -122,7 +122,6 @@ def update_pricing_file(pricing_file_path, pricing_data):
content = json.dumps(data, indent=4)
lines = content.splitlines()
- print lines
lines = [line.rstrip() for line in lines]
content = '\n'.join(lines)
http://git-wip-us.apache.org/repos/asf/libcloud/blob/b9b3f087/libcloud/data/pricing.json
----------------------------------------------------------------------
diff --git a/libcloud/data/pricing.json b/libcloud/data/pricing.json
index f054dfc..9e08d30 100644
--- a/libcloud/data/pricing.json
+++ b/libcloud/data/pricing.json
@@ -35,37 +35,6 @@
"hi1.4xlarge": "3.100",
"t1.micro": "0.020"
},
- "\"ec2_us_west": {
- "m3.2xlarge": "0.616",
- "r3.4xlarge": "1.560",
- "m1.small": "0.047",
- "c1.medium": "0.148",
- "m3.large": "0.154",
- "r3.2xlarge": "0.780",
- "t1.micro": "0.025",
- "c3.2xlarge": "0.478",
- "c3.xlarge": "0.239",
- "m1.large": "0.190",
- "c3.8xlarge": "1.912",
- "c3.4xlarge": "0.956",
- "i2.8xlarge": "7.502",
- "m2.2xlarge": "0.550",
- "c1.xlarge": "0.592",
- "g2.2xlarge": "0.702",
- "m1.xlarge": "0.379",
- "m2.xlarge": "0.275",
- "m1.medium": "0.095",
- "r3.large": "0.195",
- "i2.xlarge": "0.938",
- "m3.medium": "0.077",
- "i2.4xlarge": "3.751",
- "r3.xlarge": "0.390",
- "i2.2xlarge": "1.876",
- "c3.large": "0.120",
- "r3.8xlarge": "3.120",
- "m2.4xlarge": "1.100",
- "m3.xlarge": "0.308"
- },
"ec2_us_west": {
"m3.medium": "0.077",
"m3.large": "0.154",
@@ -456,4 +425,4 @@
},
"storage": {},
"updated": 1397154837
-}
\ No newline at end of file
+}