Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/607f5680 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/607f5680 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/607f5680 Branch: refs/heads/trunk Commit: 607f56800b0cad99311503fdc41f4f6d6613d7f7 Parents: f08785f 5d66322 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 13 10:23:06 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 13 10:23:06 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/607f5680/CHANGES.txt ----------------------------------------------------------------------
