cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: merge from 1.2
Date Tue, 30 Jul 2013 19:32:14 GMT
merge from 1.2


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

Branch: refs/heads/trunk
Commit: bdc8e26171b5000b69299122d5c773e46e4e9749
Parents: f2be80c aa51899
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 30 14:32:13 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 30 14:32:13 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               |  2 ++
 .../cassandra/hadoop/cql3/CqlPagingRecordReader.java      |  8 +++++---
 .../org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdc8e261/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4717e91,bd85e88..83310ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,10 +1,15 @@@
 -1.2.9
 +2.0.0-rc1
 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
 + * fix schema-related trigger issues (CASSANDRA-5774)
 + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
 + * Fix assertion error during repair (CASSANDRA-5801)
 + * Fix range tombstone bug (CASSANDRA-5805)
 + * DC-local CAS (CASSANDRA-5797)
 + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819)
 +Merged from 1.2:
+  * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
+    (CASSANDRA-5824)
   * update default LCS sstable size to 160MB (CASSANDRA-5727)
 -
 -
 -1.2.8
   * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
   * cqlsh: add collections support to COPY (CASSANDRA-5698)
   * retry important messages for any IOException (CASSANDRA-5804)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdc8e261/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdc8e261/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------


Mime
View raw message