Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21deff6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21deff6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21deff6c Branch: refs/heads/trunk Commit: 21deff6c99992a454771aa3df0170cc15dbc0ee6 Parents: 8df9d1f 7dc2eb9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jun 20 15:47:13 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jun 20 15:47:13 2013 -0500 ---------------------------------------------------------------------- .../cassandra/locator/Ec2MultiRegionSnitch.java | 42 +++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
