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/7c719376 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c719376 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c719376 Branch: refs/heads/trunk Commit: 7c7193769c5b85b8bcb38cf3f5afb3e3be0e1016 Parents: f601cac 4cf8a8a Author: Brandon Williams <[email protected]> Authored: Wed Mar 5 12:55:30 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Wed Mar 5 12:55:30 2014 -0600 ---------------------------------------------------------------------- build.xml | 3 - .../hadoop/AbstractColumnFamilyInputFormat.java | 1 - .../AbstractColumnFamilyOutputFormat.java | 1 - .../AbstractColumnFamilyRecordWriter.java | 2 + .../cassandra/hadoop/BulkOutputFormat.java | 3 +- .../cassandra/hadoop/BulkRecordWriter.java | 16 +- .../hadoop/ColumnFamilyInputFormat.java | 1 - .../hadoop/ColumnFamilyOutputFormat.java | 2 +- .../hadoop/ColumnFamilyRecordReader.java | 1 - .../hadoop/ColumnFamilyRecordWriter.java | 15 +- .../apache/cassandra/hadoop/HadoopCompat.java | 309 +++++++++++++++++++ .../apache/cassandra/hadoop/Progressable.java | 50 --- .../cassandra/hadoop/cql3/CqlOutputFormat.java | 3 +- .../hadoop/cql3/CqlPagingInputFormat.java | 2 +- .../hadoop/cql3/CqlPagingRecordReader.java | 2 +- .../cassandra/hadoop/cql3/CqlRecordWriter.java | 12 +- .../cassandra/hadoop/pig/CassandraStorage.java | 2 +- .../apache/cassandra/hadoop/pig/CqlStorage.java | 1 - 18 files changed, 345 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c719376/build.xml ----------------------------------------------------------------------
