simple_record 1.1.69 → 1.1.70

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/simple_record.rb +2 -2
  2. metadata +3 -3
data/lib/simple_record.rb CHANGED
@@ -62,8 +62,8 @@ module SimpleRecord
62
62
  # :pool (uses a connection pool with a maximum number of connections - NOT IMPLEMENTED YET)
63
63
  # :logger => Logger Object # Logger instance: logs to STDOUT if omitted
64
64
  def self.establish_connection(aws_access_key=nil, aws_secret_key=nil, params={})
65
- @@options.merge(params)
66
- puts 'SimpleRecord.establish_connection with ' + params.inspect
65
+ @@options.merge!(params)
66
+ puts 'SimpleRecord.establish_connection with ' + @@options.inspect
67
67
  Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
68
68
  end
69
69
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 1
8
- - 69
9
- version: 1.1.69
8
+ - 70
9
+ version: 1.1.70
10
10
  platform: ruby
11
11
  authors:
12
12
  - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-03-09 00:00:00 -08:00
19
+ date: 2010-03-11 00:00:00 -08:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency