Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b730e5f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b730e5f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b730e5f2 Branch: refs/heads/trunk Commit: b730e5f26d33a2e72054d3450ad451292fcb21ec Parents: 17adc59 89bccb6 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Mar 8 21:21:22 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Mar 8 21:21:22 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
