diff --git a/CHANGES.txt b/CHANGES.txt index 9a41c87ed1..77a488cebc 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 @@ -274,6 +275,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) @@ -615,7 +617,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)