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/6660970c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6660970c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6660970c Branch: refs/heads/trunk Commit: 6660970c397a0ac53881422a35920bee2bf2d5f7 Parents: 5cdfa69 353b214 Author: Sylvain Lebresne <[email protected]> Authored: Tue Apr 1 11:30:06 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Apr 1 11:30:06 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/filter/ColumnCounter.java | 28 ++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6660970c/CHANGES.txt ----------------------------------------------------------------------
