Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00a68398 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a68398 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00a68398 Branch: refs/heads/trunk Commit: 00a68398f576a0cb32dd7f1435ff1b7808256dea Parents: 66df206 eb57745 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Nov 8 00:54:29 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Nov 8 00:54:29 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/00a68398/src/java/org/apache/cassandra/db/context/CounterContext.java ----------------------------------------------------------------------
