cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 24 Apr 2014 03:00:40 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: cf74bcfc63f75c8ae188f804f3f42ef5cfc8379a
Parents: e6325fa 647bfc6
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Apr 23 22:00:29 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Apr 23 22:00:29 2014 -0500

----------------------------------------------------------------------
 NEWS.txt                                        |   3 +-
 .../apache/cassandra/tools/SSTableExport.java   |  93 +++++--------
 .../apache/cassandra/tools/SSTableImport.java   | 133 ++++---------------
 test/resources/CounterCF.json                   |   2 +-
 test/resources/SimpleCF.json                    |   4 +-
 test/resources/SimpleCF.oldformat.json          |   4 -
 test/resources/SimpleCFWithDeletionInfo.json    |   4 +-
 test/resources/SuperCF.json                     |   4 -
 test/resources/UnsortedCF.json                  |   4 +-
 test/resources/UnsortedSuperCF.json             |   5 -
 .../cassandra/tools/SSTableExportTest.java      |  40 +-----
 .../cassandra/tools/SSTableImportTest.java      |  51 -------
 12 files changed, 76 insertions(+), 271 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf74bcfc/NEWS.txt
----------------------------------------------------------------------


Mime
View raw message