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/a161f088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a161f088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a161f088 Branch: refs/heads/trunk Commit: a161f088cb9d2cabb635ee891e1c2082f9a45eb2 Parents: 02aad29 25af168 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 21 13:18:29 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 21 13:18:29 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Keyspace.java | 4 ++-- .../cassandra/service/SnapshotVerbHandler.java | 4 +++- .../cassandra/service/StorageService.java | 23 ++++++++++---------- 4 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a161f088/CHANGES.txt ----------------------------------------------------------------------
