From 7ebe8375a38b317ca8870ebe876afb475787c6e2 Mon Sep 17 00:00:00 2001
From: Brad Heller <brad@cloudability.com>
Date: Sun, 9 Sep 2012 21:56:23 -0700
Subject: [PATCH 1/3] Add support for pulling out virtualization type when
 parsing AWS Describe Instances results.

---
 lib/fog/aws/parsers/compute/describe_instances.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/parsers/compute/describe_instances.rb b/lib/fog/aws/parsers/compute/describe_instances.rb
index 3a13bb0bd..940c559a2 100644
--- a/lib/fog/aws/parsers/compute/describe_instances.rb
+++ b/lib/fog/aws/parsers/compute/describe_instances.rb
@@ -34,7 +34,7 @@ module Fog
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'rootDeviceType'
+                  'reason', 'rootDeviceType', 'virtualizationType'
               @instance[name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)

From 0a3e8bd6c4a5b89a5cf84fdf2bc41e50b418eda0 Mon Sep 17 00:00:00 2001
From: Brad Heller <brad@cloudability.com>
Date: Tue, 16 Oct 2012 15:31:16 -0700
Subject: [PATCH 2/3] Ignore tags

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index cc588ee8c..dfc08e9ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ rdoc
 pkg
 spec/credentials.yml
 vendor/*
+tags

From 12fdd7770545e3ffa97271e1d99c8acb75c43470 Mon Sep 17 00:00:00 2001
From: Brad Heller <brad@cloudability.com>
Date: Tue, 16 Oct 2012 15:41:31 -0700
Subject: [PATCH 3/3] NextMarker => NextToken. Maybe that's what it used to
 be...?

---
 lib/fog/aws/parsers/cloud_watch/list_metrics.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/aws/parsers/cloud_watch/list_metrics.rb b/lib/fog/aws/parsers/cloud_watch/list_metrics.rb
index 772509d33..0a6167b9f 100644
--- a/lib/fog/aws/parsers/cloud_watch/list_metrics.rb
+++ b/lib/fog/aws/parsers/cloud_watch/list_metrics.rb
@@ -38,7 +38,7 @@ module Fog
               @metric[name] = value
             when 'Dimensions'
               @in_dimensions = false
-            when 'NextMarker'
+            when 'NextMarker', 'NextToken'
               @response['ListMetricsResult'][name] = value
             when 'RequestId'
               @response['ResponseMetadata'][name] = value