From 39bcc8cd9d2d95a8600760be2d55a2b5bc9b3b22 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Fri, 29 Jun 2012 17:23:18 +0200
Subject: [PATCH] Update changelog and news file

---
 CHANGES.txt | 4 ++++
 NEWS.txt    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 65f9fbba3c..eda806c8b3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -25,6 +25,10 @@
  * (cql3) Fix deletion bug (CASSANDRA-4193)
  * Fix computation of overlapping sstable for leveled compaction (CASSANDRA-4321)
  * Improve scrub and allow to run it offline (CASSANDRA-4321)
+ * Fix assertionError in StorageService.bulkLoad (CASSANDRA-4368)
+ * (cqlsh) add option to authenticate to a keyspace at startup (CASSANDRA-4108)
+ * (cqlsh) fix ASSUME functionality (CASSANDRA-4352)
+ * Fix ColumnFamilyRecordReader to not return progress > 100% (CASSANDRA-3942)
 Merged from 1.0:
  * Set gc_grace on index CF to 0 (CASSANDRA-4314)
 
diff --git a/NEWS.txt b/NEWS.txt
index 9de9f21a33..fd7be27178 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -17,6 +17,10 @@ Upgrading
     - Nothing specific to this release, but please see 1.1 if you are upgrading
       from a previous version.
 
+Features
+--------
+    - cqlsh has a new COPY command to load data from CSV flat files
+
 
 1.1.1
 =====