Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ec971b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ec971b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ec971b8
Branch: refs/heads/trunk
Commit: 8ec971b89a256dc33cde366229f2bfbe67fd4109
Parents: 4fae76c 69c1ee9
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Thu Nov 28 05:16:06 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Nov 28 05:16:06 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/SSTableImport.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ec971b8/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
