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/bb3f09c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb3f09c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb3f09c4 Branch: refs/heads/trunk Commit: bb3f09c4b189d27bf136ad9df044d378019607d5 Parents: 815b238 d044fe6 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 17:08:23 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 17:08:23 2013 -0500 ---------------------------------------------------------------------- lib/licenses/disruptor-3.0.1.txt | 201 +++++++++++++++++++++ lib/licenses/thrift-server-0.3.0.txt | 202 ++++++++++++++++++++++ src/java/org/apache/cassandra/db/Column.java | 13 +- 3 files changed, 406 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
