Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26307f96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26307f96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26307f96 Branch: refs/heads/trunk Commit: 26307f96ccb89d8e69d63b6be1db77f92ae16c39 Parents: f01166a 00a6839 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Nov 8 00:55:16 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Nov 8 00:55:16 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/context/CounterContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26307f96/src/java/org/apache/cassandra/db/context/CounterContext.java ----------------------------------------------------------------------
