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/cf94e3c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf94e3c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf94e3c3 Branch: refs/heads/trunk Commit: cf94e3c318c98c7f5fa5bfdc03b8c86d1bc464b2 Parents: 611d1ba deff175 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Nov 12 11:48:45 2014 -0600 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Nov 12 11:48:45 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/HadoopCompat.java | 2 -- 1 file changed, 2 deletions(-) ----------------------------------------------------------------------