merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/950efdef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/950efdef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/950efdef Branch: refs/heads/trunk Commit: 950efdef9c6406d80268aed2ce7713ef5d396a9a Parents: 40669a3 9d0eec2 Author: Jonathan Ellis <[email protected]> Authored: Tue May 21 13:53:00 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 21 13:53:00 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + examples/pig/test/test_storage.pig | 2 +- .../cassandra/hadoop/pig/CassandraStorage.java | 23 ++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/950efdef/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 103f659,24e9163..25290cd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,8 +1,9 @@@ 1.2.6 * Write row markers when serializing schema (CASSANDRA-5572) * Check only SSTables for the requested range when streaming (CASSANDRA-5569) -Merged from 1.1 +Merged from 1.1: + * Remove buggy thrift max message length option (CASSANDRA-5529) + * Fix NPE in Pig's widerow mode (CASSANDRA-5488) 1.2.5
