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/09 00:09:47 UTC
[17/19] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
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 <jb...@apache.org>
Authored: Thu Aug 8 17:08:23 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
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(-)
----------------------------------------------------------------------