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/2eae4364 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2eae4364 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2eae4364 Branch: refs/heads/trunk Commit: 2eae43649819c6c350a64c3447b619b88e2f9341 Parents: b6ce0a6 607f568 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 13 10:23:13 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 13 10:23:13 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageService.java | 2 +- src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2eae4364/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2eae4364/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
