cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [14/16] git commit: Merge remote-tracking branch 'origin/cassandra-2.0.0' into cassandra-2.0.0
Date Thu, 08 Aug 2013 20:52:36 GMT
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/cassandra-2.0.0
Commit: 5411e5ff850bd1bbbf8d9f0057ff4136402b2bff
Parents: fdfdd5c 7a8cbb3
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Aug 8 15:51:58 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
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(-)
----------------------------------------------------------------------



Mime
View raw message