Merge remote-tracking branch 'origin/cassandra-2.0.0' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5411e5ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5411e5ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5411e5ff Branch: refs/heads/trunk Commit: 5411e5ff850bd1bbbf8d9f0057ff4136402b2bff Parents: fdfdd5c 7a8cbb3 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 15:51:58 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 15:51:58 2013 -0500 ---------------------------------------------------------------------- lib/licenses/disruptor-3.0.1.txt | 201 ++++++++++++++++++ lib/licenses/thrift-server-0.3.0.txt | 202 +++++++++++++++++++ .../cassandra/service/CassandraDaemon.java | 14 +- .../cassandra/service/StorageService.java | 5 +- 4 files changed, 406 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
