Permalink
Browse files

Merge remote branch 'b/unique_endpoints'

  • Loading branch information...
2 parents 98ea2e0 + 17b5aa5 commit 265d99d1f4e534125f81f60b789fb04959880f41 @ryanking ryanking committed Sep 10, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/cassandra/0.7/cassandra.rb
  2. +1 −1 lib/cassandra/0.7/protocol.rb
@@ -154,7 +154,7 @@ def check_keyspace(ks = @keyspace)
def all_nodes
if @auto_discover_nodes && !@keyspace.eql?("system")
- ips = (new_client.describe_ring(@keyspace).map {|range| range.endpoints}).flatten
+ ips = (new_client.describe_ring(@keyspace).map {|range| range.endpoints}).flatten.uniq
port = @servers.first.split(':').last
ips.map{|ip| "#{ip}:#{port}" }
else
@@ -9,7 +9,7 @@ def _mutate(mutation_map, consistency_level)
end
def _remove(key, column_path, timestamp, consistency_level)
- client.remove(key, column_path, timestamp, consistency_level)
+ client.remove(key, column_path, CassandraThrift::Clock.new(:timestamp => timestamp), consistency_level)
end
def _count_columns(column_family, key, super_column, consistency)

0 comments on commit 265d99d

Please sign in to comment.