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/6fe526a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fe526a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fe526a5 Branch: refs/heads/trunk Commit: 6fe526a56eeaa340ea2b319a54cb4fca21440bf2 Parents: c732447 c6dbba1 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 14:53:52 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 14:53:52 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../apache/cassandra/db/filter/ColumnSlice.java | 9 ++-- .../apache/cassandra/net/MessagingService.java | 13 +++++- .../org/apache/cassandra/utils/ExpiringMap.java | 47 +++++++++++++++----- .../cassandra/db/filter/ColumnSliceTest.java | 4 ++ .../apache/cassandra/service/RemoveTest.java | 1 + 6 files changed, 57 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fe526a5/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fe526a5/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
