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/7bb6f012 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bb6f012 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bb6f012 Branch: refs/heads/trunk Commit: 7bb6f012b48fa6c38f78467306893aa52dfd9b4a Parents: 56a47b3 b4dca44 Author: Jason Brown <jasedbr...@gmail.com> Authored: Thu Jun 20 12:21:40 2013 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Thu Jun 20 12:21:40 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/locator/Ec2MultiRegionSnitch.java | 22 +++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bb6f012/CHANGES.txt ----------------------------------------------------------------------
