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/3e0dac5a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e0dac5a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e0dac5a Branch: refs/heads/trunk Commit: 3e0dac5a443c6e8c089a832ddc05617241cdfb48 Parents: 386ed8f 486cc4c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Apr 2 17:03:15 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Apr 2 17:03:15 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/SSTableImport.java | 2 +- test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
