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/46193d75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46193d75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46193d75 Branch: refs/heads/trunk Commit: 46193d7548aefb2f7c7b33597b282c0361e204fc Parents: 17055bf ddda541 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Aug 7 16:22:52 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Aug 7 16:22:52 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/tools/SSTableExport.java | 132 ++++++++++--------- 2 files changed, 74 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46193d75/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46193d75/src/java/org/apache/cassandra/tools/SSTableExport.java ----------------------------------------------------------------------