master_slave_adapter_soundcloud 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/master_slave_adapter.rb

@@ -352,7 +352,8 @@ module ActiveRecord
       end
 
       def slave_consistent?(conn, clock)
-        (get_last_seen_slave_clock(conn) || slave_clock(conn)).try(:>=, clock)
+        get_last_seen_slave_clock(conn).try(:>=, clock) ||
+          slave_clock(conn).try(:>=, clock)
       end
 
     protected

data/master_slave_adapter.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'master_slave_adapter_soundcloud'
   s.version     = File.read('VERSION').to_s
-  s.date        = '2011-08-23'
+  s.date        = '2011-08-24'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Mauricio Linhares', 'Torsten Curdt', 'Kim Altintop', 'Omid Aladini', 'SoundCloud' ]
   s.email       = %q{kim@soundcloud.com tcurdt@soundcloud.com omid@soundcloud.com}

metadata

@@ -2,7 +2,7 @@
 name: master_slave_adapter_soundcloud
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Mauricio Linhares
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +02:00
+date: 2011-08-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency