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/de860026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de860026 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de860026 Branch: refs/heads/trunk Commit: de860026cc8f05a6b47609f2d174f5ed696ecb50 Parents: 64e4628 04884eb Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Apr 29 12:08:43 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Apr 29 12:08:43 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/locator/SnitchProperties.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de860026/CHANGES.txt ----------------------------------------------------------------------
