<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,3 +1,6 @@
+=== 0.3.1 2008-09-18
+ * Added basic custom kernel id support to run_instances.  Thanks to Keith Hudgins for the patch.
+
 === 0.3.0 2008-08-24
  * Changed response object from AmazonEC2::Response to Hash (patch from Yan Pritzker 'skwp') Thanks!
  * Added support for Elastic Block Storage (patch from Yann Klis 'yannski') Thanks!</diff>
      <filename>CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,5 @@
 GEM       = &quot;amazon-ec2&quot;
-VER       = &quot;0.3.0&quot;
+VER       = &quot;0.3.1&quot;
 AUTHOR    = &quot;Glenn Rempe&quot;
 EMAIL     = &quot;glenn.rempe@gmail.com&quot;
 HOMEPAGE  = &quot;http://github.com/grempe/amazon-ec2/&quot;</diff>
      <filename>amazon-ec2.gemspec</filename>
    </modified>
    <modified>
      <diff>@@ -64,6 +64,7 @@ module EC2
     # :user_data =&gt; String (default : nil)
     # :addressing_type =&gt; String (default : &quot;public&quot;)
     # :instance_type =&gt; String (default : &quot;m1.small&quot;)
+    # :kernel_id =&gt; String (default : nil)
     # :availability_zone =&gt; String (default : nil)
     # :base64_encoded =&gt; Boolean (default : false)
     #
@@ -77,6 +78,7 @@ module EC2
                   :user_data =&gt; nil,
                   :addressing_type =&gt; &quot;public&quot;,
                   :instance_type =&gt; &quot;m1.small&quot;,
+                  :kernel_id =&gt; nil,
                   :availability_zone =&gt; nil,
                   :base64_encoded =&gt; false }.merge(options)
 
@@ -111,6 +113,7 @@ module EC2
       params[&quot;UserData&quot;] = user_data unless user_data.nil?
       params[&quot;AddressingType&quot;] = options[:addressing_type]
       params[&quot;InstanceType&quot;] = options[:instance_type]
+      params[&quot;KernelId&quot;] = options[:kernel_id] unless options[:kernel_id].nil?
       params[&quot;Placement.AvailabilityZone&quot;] = options[:availability_zone] unless options[:availability_zone].nil?
 
       return response_generator(:action =&gt; &quot;RunInstances&quot;, :params =&gt; params)</diff>
      <filename>lib/EC2/instances.rb</filename>
    </modified>
    <modified>
      <diff>@@ -232,6 +232,11 @@ context &quot;EC2 instances &quot; do
     @ec2.run_instances( :image_id =&gt; &quot;ami-60a54009&quot;, :min_count =&gt; 1, :max_count =&gt; 1, :group_id =&gt; [], :user_data =&gt; &quot;foo&quot;, :base64_encoded =&gt; true ).should.be.an.instance_of Hash
   end
 
+  specify &quot;should be able specify an kernel_id&quot; do
+    @ec2.stubs(:make_request).with('RunInstances', &quot;ImageId&quot; =&gt; &quot;ami-60a54009&quot;, &quot;MinCount&quot; =&gt; '1', &quot;MaxCount&quot; =&gt; '1', &quot;Placement.AvailabilityZone&quot; =&gt; &quot;zone123&quot;, &quot;UserData&quot; =&gt; &quot;foo&quot;, &quot;AddressingType&quot; =&gt; 'public', 'InstanceType' =&gt; 'm1.small', 'KernelId' =&gt; 'kernfoo').
+      returns stub(:body =&gt; @run_instances_response_body, :is_a? =&gt; true)
+    @ec2.run_instances( :image_id =&gt; &quot;ami-60a54009&quot;, :min_count =&gt; 1, :max_count =&gt; 1, :availability_zone =&gt; &quot;zone123&quot;, :group_id =&gt; [], :user_data =&gt; &quot;foo&quot;, :base64_encoded =&gt; true, :kernel_id =&gt; 'kernfoo' ).should.be.an.instance_of Hash
+  end
 
   specify &quot;should be able to call run_instances with :user_data and :base64_encoded =&gt; false&quot; do
     @ec2.stubs(:make_request).with('RunInstances', &quot;ImageId&quot; =&gt; &quot;ami-60a54009&quot;, &quot;MinCount&quot; =&gt; '1', &quot;MaxCount&quot; =&gt; '1', &quot;UserData&quot; =&gt; &quot;Zm9v&quot;, &quot;AddressingType&quot; =&gt; 'public', 'InstanceType' =&gt; 'm1.small').</diff>
      <filename>test/test_EC2_instances.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>774f187a52e639bf5dba537acc2c63a949e8de51</id>
    </parent>
  </parents>
  <author>
    <name>Glenn Rempe</name>
    <email>glenn@rempe.us</email>
  </author>
  <url>http://github.com/grempe/amazon-ec2/commit/24bbcc9047091b4c3cb79e3691858e6b1c5d6313</url>
  <id>24bbcc9047091b4c3cb79e3691858e6b1c5d6313</id>
  <committed-date>2008-09-18T19:22:58-07:00</committed-date>
  <authored-date>2008-09-18T19:22:58-07:00</authored-date>
  <message>Added basic kernel ID support to run_instances method.  Thanks to Keith Hudgins for the patch.</message>
  <tree>83ee0b0a262797c37eee7f0879a5733b46707849</tree>
  <committer>
    <name>Glenn Rempe</name>
    <email>glenn@rempe.us</email>
  </committer>
</commit>
