cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [10/14] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Mon, 11 Aug 2014 18:04:05 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d744b5d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d744b5d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d744b5d

Branch: refs/heads/cassandra-2.1.0
Commit: 1d744b5d4d2c18c3f43fd8a1cdd33b333186d290
Parents: ce96a2a 52df514d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Aug 11 13:03:13 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Aug 11 13:03:13 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  |   2 +-
 .../cassandra/hadoop/cql3/CqlRecordReader.java  | 138 ++++++++++++++++++-
 .../cassandra/hadoop/pig/CqlNativeStorage.java  |  15 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java |   4 +-
 5 files changed, 150 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d744b5d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 64b4d65,ddf4627..f34b912
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.0.10
 +2.1.0-rc6
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
+  * Give CRR a default input_cql Statement (CASSANDRA-7226)
   * Better error message when adding a collection with the same name
     than a previously dropped one (CASSANDRA-6276)
   * Fix validation when adding static columns (CASSANDRA-7730)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d744b5d/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d744b5d/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d744b5d/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d744b5d/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------


Mime
View raw message