cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [19/19] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 08 Aug 2013 22:09:49 GMT
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70c0d30d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70c0d30d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70c0d30d

Branch: refs/heads/trunk
Commit: 70c0d30df966784eb5bae8fa8dfe172bc6cc0d88
Parents: a1212c5 bb3f09c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Aug 8 17:08:41 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Aug 8 17:08:41 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 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 +-
 .../compress/CompressedRandomAccessReader.java  |  14 +-
 .../io/compress/CompressedSequentialWriter.java |   7 +-
 .../io/compress/CompressionMetadata.java        |   6 +-
 .../apache/cassandra/io/sstable/Descriptor.java |   6 +-
 .../compress/CompressedInputStream.java         |  17 +-
 .../compress/CompressedStreamReader.java        |   2 +-
 test/data/serialization/2.0/db.RowMutation.bin  | Bin 3599 -> 3599 bytes
 .../CompressedRandomAccessReaderTest.java       |   4 +-
 .../compress/CompressedInputStreamTest.java     |   2 +-
 13 files changed, 450 insertions(+), 25 deletions(-)
----------------------------------------------------------------------



Mime
View raw message