You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/08 22:52:34 UTC

[12/16] git commit: Merge branch 'cassandra-2.0' into trunk

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/670979d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/670979d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/670979d4

Branch: refs/heads/trunk
Commit: 670979d4ef0c528c5c1fcc8f61ff05f8293387ed
Parents: c7782f2 b5f445b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 15:50:30 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 15:50:30 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                  |  4 ++++
 src/java/org/apache/cassandra/db/Column.java | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------