From f618369f392af6927adc587ebfbeb595925fe138 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 7 Dec 2012 16:52:54 -0600 Subject: [PATCH 1/2] add #2474, #4434 to CHANGES --- CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5d1fd8d41b..874dbd4fd5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -113,6 +113,7 @@ Merged from 1.0: 1.1.3 + * (cqlsh) add COPY TO (CASSANDRA-4434) * munmap commitlog segments before rename (CASSANDRA-4337) * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning multi-MB results as an attribute (CASSANDRA-4452) @@ -454,7 +455,7 @@ Merged from 0.8: * Add SnapshotCommand to trigger snapshot on remote node (CASSANDRA-3721) * Make CFMetaData conversions to/from thrift/native schema inverses (CASSANDRA_3559) - * Add initial code for CQL 3.0-beta (CASSANDRA-3781, 3753) + * Add initial code for CQL 3.0-beta (CASSANDRA-2474, 3781, 3753) * Add wide row support for ColumnFamilyInputFormat (CASSANDRA-3264) * Allow extending CompositeType comparator (CASSANDRA-3657) * Avoids over-paging during get_count (CASSANDRA-3798) From 8f7754dd4b8f9972f9b59e4ec24de6691a0c076f Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Fri, 7 Dec 2012 16:47:59 -0600 Subject: [PATCH 2/2] edit changes --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 9a41c87ed1..6f7011d42d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -201,6 +201,7 @@ Merged from 1.1: * (cql3) Allow defining default consistency levels (CASSANDRA-4448) * (cql3) Fix queries using LIMIT missing results (CASSANDRA-4579) * fix cross-version gossip messaging (CASSANDRA-4576) + * added inet data type (CASSANDRA-4627) 1.1.6