update CHANGES, NEWS

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

Branch: refs/heads/cassandra-1.1.0
Commit: 762b455978a67c00a2e3a7d5f0a2ef02f0bae98d
Parents: 54729ad
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Wed Apr 18 11:32:01 2012 -0500
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Wed Apr 18 11:37:42 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt |    2 ++
 NEWS.txt    |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/762b4559/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 720289f..3644c33 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,9 +4,11 @@
 Merged from 1.0:
  * avoid streaming empty files with bulk loader if sstablewriter errors out
    (CASSANDRA-3946)
+ * fix stress build (CASSANDRA-4140)
 
 
 1.1-rc1
+ * Include stress tool in binary builds (CASSANDRA-4103)
  * (Hadoop) fix wide row iteration when last row read was deleted
    (CASSANDRA-4154)
  * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/762b4559/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index eca9e02..9eeb4be 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -76,6 +76,9 @@ Features
       threshold.
     - Off-heap caches no longer require JNA.
     - Streaming is now multithreaded.
+    - Compactions may now be aborted via JMX or nodetool.
+    - The stress tool is not new in 1.1, but it is newly included in
+      binary builds as well as the source tree
 
 
 1.0.8

Reply via email to