git commit: updated news and changes

[ja...@apache.org]

Updated Branches:
  refs/heads/cassandra-1.2 5c0c84b3d -> bcb9edcf5


updated news and changes


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

Branch: refs/heads/cassandra-1.2
Commit: bcb9edcf5ee46d9ec87b09bc26b4635dfbe8937f
Parents: 5c0c84b
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Oct 17 14:14:26 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Oct 17 14:14:26 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb9edcf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6ecac1..0435d4e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 1.2.12
  * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
  * Mark CF clean if a mutation raced the drop and got it marked dirty 
+ * Add a LOCAL_ONE consistency level (CASSANDRA-6202)
 
 
 1.2.11

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcb9edcf/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 9fb634f..000986f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,13 @@ restore snapshots created with the previous major version using the
 using the provided 'sstableupgrade' tool.
 
 
+1.2.12
+======
+Features
+--------
+    - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE operations to
+      execute only in the local datacenter.
+
 1.2.11
 ======