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/47863bc3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47863bc3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47863bc3 Branch: refs/heads/trunk Commit: 47863bc32d4273978f0e26532c24e61b67075423 Parents: 810c2d5 e711929 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Oct 10 16:57:38 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Oct 10 16:57:38 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BufferCounterUpdateCell.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47863bc3/CHANGES.txt ----------------------------------------------------------------------