<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -58,7 +58,7 @@ module AWS
     class InvalidConnectionOption &lt; InvalidOption
       def initialize(invalid_options)
         message = &quot;The following connection options are invalid: #{invalid_options.join(', ')}. &quot;    +
-                  &quot;The valid connection options are: #{Connection::Options.valid_options.join(', ')}.&quot;
+                  &quot;The valid connection options are: #{Connection::Options::VALID_OPTIONS.join(', ')}.&quot;
         super(message)
       end
     end</diff>
      <filename>lib/aws/s3/exceptions.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 class ConnectionTest &lt; Test::Unit::TestCase
   attr_reader :keys
   def setup
-    @keys = {:access_key_id =&gt; '123', :secret_access_key =&gt; 'abc'}
+    @keys = {:access_key_id =&gt; '123', :secret_access_key =&gt; 'abc'}.freeze
   end
   
   def test_creating_a_connection
@@ -207,7 +207,6 @@ class ConnectionOptionsTest &lt; Test::Unit::TestCase
   private
     def assert_key_transfered(key, value, options)
       assert_equal value, options[key]
-      assert !options.instance_variable_get('@options').has_key?(key)
     end
       
     def generate_options(options = {})</diff>
      <filename>test/connection_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>7b76018725ba9a2d02664fc77571454c426ace40</id>
    </parent>
    <parent>
      <id>1191298b4024f5c146c91e4f4a30a8c9a062b036</id>
    </parent>
  </parents>
  <author>
    <name>Marcel Molina</name>
    <email>marcel@marcelmolina.com</email>
  </author>
  <url>http://github.com/packagethief/aws-s3/commit/e2a13a63666988b191131a00b5611d3387761d5b</url>
  <id>e2a13a63666988b191131a00b5611d3387761d5b</id>
  <committed-date>2009-04-19T17:07:12-07:00</committed-date>
  <authored-date>2009-04-19T17:07:12-07:00</authored-date>
  <message>Merge branch 'master' of git://github.com/marcandre/aws-s3 into marcandre/master</message>
  <tree>e895d503a2a43a2df0d631ece7e6488ccdbaf251</tree>
  <committer>
    <name>Marcel Molina</name>
    <email>marcel@marcelmolina.com</email>
  </committer>
</commit>
