aws 2.3.24 → 2.3.25

data/lib/acf/right_acf_interface.rb

@@ -142,7 +142,7 @@ module Aws
       # Raises AwsError if any banana happened.
     def request_info(request, parser, &block) # :nodoc:
       thread = @params[:multi_thread] ? Thread.current : Thread.main
-      thread[:acf_connection] ||= Aws::HttpConnection.new(:exception => Aws::AwsError, :logger => @logger)
+      thread[:acf_connection] ||= Rightscale::HttpConnection.new(:exception => Aws::AwsError, :logger => @logger)
       request_info_impl(thread[:acf_connection], @@bench, request, parser, &block)
     end
 
@@ -278,7 +278,9 @@ module Aws
     #     :e_tag            => "E39OHHU1ON65SI",
     #     :cnames           => ["web1.my-awesome-site.net", "web2.my-awesome-site.net"]
     #     :comment          => "Woo-Hoo!",
-    #     :origin           => "my-bucket.s3.amazonaws.com"}
+    #     :origin           => "my-bucket.s3.amazonaws.com",
+    #     :default_root_object => 
+    #     }
     #  config[:comment] = 'Olah-lah!'
     #  config[:enabled] = false
     #  acf.set_distribution_config('E2REJM3VUN5RSI', config) #=> true
@@ -289,6 +291,7 @@ module Aws
       unless config[:cnames].blank?
         config[:cnames].to_a.each { |cname| cnames_str += "\n           <CNAME>#{cname}</CNAME>" }
       end
+      root_ob = config[:default_root_object] ? "<DefaultRootObject>#{config[:default_root_object]}</DefaultRootObject>" : ""
       # format request's XML body
       body = <<-EOXML
         <?xml version="1.0" encoding="UTF-8"?>
@@ -298,6 +301,7 @@ module Aws
            #{cnames_str.lstrip}
            <Comment>#{AcfInterface::escape(config[:comment].to_s)}</Comment>
            <Enabled>#{config[:enabled]}</Enabled>
+           #{root_ob}
         </DistributionConfig>
       EOXML
       request_hash = generate_request('PUT', "distribution/#{aws_id}/config", body.strip,

data/lib/sdb/right_sdb_interface.rb

@@ -97,7 +97,7 @@ module Aws
         # Raises AwsError if any banana happened
         def request_info(request, parser)  #:nodoc:
 #       request_info2(request, parser, :sdb_connection)
-            request_info2(request, parser, @params, :s3_connection, @logger, @@bench)
+            request_info2(request, parser, @params, :sdb_connection, @logger, @@bench)
 
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 3
-  - 24
-  version: 2.3.24
+  - 25
+  version: 2.3.25
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency