Merge branch 'cassandra-2.0.0' 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/b5f445b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5f445b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5f445b4 Branch: refs/heads/trunk Commit: b5f445b448e6047e717b17985c117843e66a2d40 Parents: c526131 fdfdd5c Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 15:50:16 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 15:50:16 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/db/Column.java | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5f445b4/CHANGES.txt ----------------------------------------------------------------------
