You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/05/21 20:54:18 UTC
[10/11] git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f32c988a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f32c988a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f32c988a
Branch: refs/heads/trunk
Commit: f32c988abff8887a43fcbb21177cb7e9b0a0183e
Parents: e66ec49 44f178d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 21 13:53:58 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 21 13:53:58 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/f32c988a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 96c9247,fe19895..151c9f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -53,8 -53,8 +53,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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f32c988a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------