Merge branch 'cassandra-1.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/6c521cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c521cae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c521cae Branch: refs/heads/trunk Commit: 6c521caec460f1528099c58e51197a59acf19cb4 Parents: 9af3b02 5dab451 Author: Brandon Williams <[email protected]> Authored: Fri Jul 27 11:52:03 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Jul 27 11:52:03 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/CounterColumn.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c521cae/src/java/org/apache/cassandra/db/CounterColumn.java ----------------------------------------------------------------------
