diff --git a/debian/changelog b/debian/changelog index 70d6b8cd..5182224c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,12 @@ byobu (4.47) unreleased; urgency=low * etc/profile.d/Z97-byobu.sh: - remove unnecessary 'true' + * usr/share/byobu/ec2/Makefile.am, usr/share/byobu/ec2/rates.ap- + northeast-1, usr/share/byobu/ec2/rates.ap-southeast-1, + usr/share/byobu/ec2/rates.eu-west-1, usr/share/byobu/ec2/rates.us- + east-1, usr/share/byobu/ec2/rates.us-west-1, + usr/share/byobu/ec2/rates.us-west-2: + - added new us-west-2 (Oregon) pricing region -- Dustin Kirkland Tue, 08 Nov 2011 19:16:15 -0600 diff --git a/usr/share/byobu/ec2/Makefile.am b/usr/share/byobu/ec2/Makefile.am index f35258f7..7bebeae4 100644 --- a/usr/share/byobu/ec2/Makefile.am +++ b/usr/share/byobu/ec2/Makefile.am @@ -1,2 +1,2 @@ ec2dir = $(datadir)/@PACKAGE@/ec2 -ec2_DATA = rates.ap-northeast-1 rates.ap-southeast-1 rates.eu-west-1 rates.us-east-1 rates.us-west-1 +ec2_DATA = rates.ap-northeast-1 rates.ap-southeast-1 rates.eu-west-1 rates.us-east-1 rates.us-west-1 rates.us-west-2 diff --git a/usr/share/byobu/ec2/rates.ap-northeast-1 b/usr/share/byobu/ec2/rates.ap-northeast-1 index 1567f59b..44b221db 100644 --- a/usr/share/byobu/ec2/rates.ap-northeast-1 +++ b/usr/share/byobu/ec2/rates.ap-northeast-1 @@ -1,4 +1,4 @@ -# 2011-05-25: Approximate Instance Cost Basis per hour from +# 2011-11-09: Approximate Instance Cost Basis per hour from # http://aws.amazon.com/ec2/instance-types/ # http://aws.amazon.com/ec2/pricing/ # for AP - Tokyo diff --git a/usr/share/byobu/ec2/rates.ap-southeast-1 b/usr/share/byobu/ec2/rates.ap-southeast-1 index 6afeb87a..41f40884 100644 --- a/usr/share/byobu/ec2/rates.ap-southeast-1 +++ b/usr/share/byobu/ec2/rates.ap-southeast-1 @@ -1,4 +1,4 @@ -# 2011-05-25: Approximate Instance Cost Basis per hour from +# 2011-11-09: Approximate Instance Cost Basis per hour from # http://aws.amazon.com/ec2/instance-types/ # http://aws.amazon.com/ec2/pricing/ # for AP - Singapore diff --git a/usr/share/byobu/ec2/rates.eu-west-1 b/usr/share/byobu/ec2/rates.eu-west-1 index 995f6200..b1feb7db 100644 --- a/usr/share/byobu/ec2/rates.eu-west-1 +++ b/usr/share/byobu/ec2/rates.eu-west-1 @@ -1,4 +1,4 @@ -# 2011-05-25: Approximate Instance Cost Basis per hour from +# 2011-11-09: Approximate Instance Cost Basis per hour from # http://aws.amazon.com/ec2/instance-types/ # http://aws.amazon.com/ec2/pricing/ # for EU - Ireland diff --git a/usr/share/byobu/ec2/rates.us-east-1 b/usr/share/byobu/ec2/rates.us-east-1 index bf6c0b0c..e0d48203 100644 --- a/usr/share/byobu/ec2/rates.us-east-1 +++ b/usr/share/byobu/ec2/rates.us-east-1 @@ -1,4 +1,4 @@ -# 2011-05-25: Approximate Instance Cost Basis per hour from +# 2011-11-09: Approximate Instance Cost Basis per hour from # http://aws.amazon.com/ec2/instance-types/ # http://aws.amazon.com/ec2/pricing/ # for US - N. Virginia diff --git a/usr/share/byobu/ec2/rates.us-west-1 b/usr/share/byobu/ec2/rates.us-west-1 index a625a61f..65eee3ed 100644 --- a/usr/share/byobu/ec2/rates.us-west-1 +++ b/usr/share/byobu/ec2/rates.us-west-1 @@ -1,4 +1,4 @@ -# 2011-05-25: Approximate Instance Cost Basis per hour from +# 2011-11-09: Approximate Instance Cost Basis per hour from # http://aws.amazon.com/ec2/instance-types/ # http://aws.amazon.com/ec2/pricing/ # for US - N. California diff --git a/usr/share/byobu/ec2/rates.us-west-2 b/usr/share/byobu/ec2/rates.us-west-2 new file mode 100644 index 00000000..a452d178 --- /dev/null +++ b/usr/share/byobu/ec2/rates.us-west-2 @@ -0,0 +1,15 @@ +# 2011-11-09: Approximate Instance Cost Basis per hour from +# http://aws.amazon.com/ec2/instance-types/ +# http://aws.amazon.com/ec2/pricing/ +# for US - Oregon +m1_small="0.085" +m1_large="0.34" +m1_xlarge="0.68" +t1_micro="0.02" +m2_xlarge="0.50" +m2_2xlarge="1.00" +m2_4xlarge="2.00" +c1_medium="0.17" +c1_xlarge="0.68" +cc1_4xlarge="1.60" +cg1_4xlarge="2.10"