Updated Branches: refs/heads/trunk 689410b89 -> eaedd259c
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/eaedd259 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaedd259 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaedd259 Branch: refs/heads/trunk Commit: eaedd259c8b5ec584a964d1f4659f9fcf7133661 Parents: 689410b a71e526 Author: Vijay Parthasarathy <[email protected]> Authored: Fri Jan 18 10:58:13 2013 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Fri Jan 18 10:58:13 2013 -0800 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/Ec2Snitch.java | 15 ++++++++ .../apache/cassandra/db/marshal/RoundTripTest.java | 26 --------------- 2 files changed, 15 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
