Merge branch 'cassandra-1.1' into trunk

Conflicts:
	NEWS.txt
	build.xml

.rat-excludes

@@ -27,6 +27,7 @@ conf/schema-sample.txt
 drivers/txpy/txcql/cassandra/*
 drivers/py/cql/cassandra/*
 doc/cql/CQL*
+doc/cql3/CQL*
 build.properties.default
 test/data/legacy-sstables/**
 examples/pig/**

CHANGES.txt

@@ -52,6 +52,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)
 

NEWS.txt

@@ -42,6 +42,19 @@ Features
       on timeouts for different operation types
 
 
+1.1.2
+=====
+
+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
 =====
 

debian/changelog

@@ -1,3 +1,9 @@
+cassandra (1.1.2) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 29 Jun 2012 16:56:29 +0200
+
 cassandra (1.1.1) unstable; urgency=low
 
   * New release