You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/06 18:32:10 UTC
git commit: fix changes/news
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 006853300 -> 8d93c1fcb
fix changes/news
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d93c1fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d93c1fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d93c1fc
Branch: refs/heads/cassandra-2.0
Commit: 8d93c1fcba4112956d10c90560471eaba84c64c9
Parents: 0068533
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 11:27:32 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 11:27:32 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 ++++----
NEWS.txt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25a5cc1..d65a694 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,10 +22,6 @@ Merged from 1.2:
* Fix schema concurrency exceptions (CASSANDRA-6841)
* Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
(CASSANDRA-6822)
- * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
- * Schedule schema pulls on change (CASSANDRA-6971)
- * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
- * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
* Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
@@ -38,6 +34,10 @@ Merged from 1.2:
2.0.7
* Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+ * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
+ * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
+ * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+ * Schedule schema pulls on change (CASSANDRA-6971)
* Avoid early loading of non-system keyspaces before compaction-leftovers
cleanup at startup (CASSANDRA-6913)
* Restrict Windows to parallel repairs (CASSANDRA-6907)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d93c1fc/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 04fa986..35e48d6 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -23,7 +23,7 @@ New features
Upgrading
---------
- - Nothing specific to this release, but please see 2.0.8 if you are upgrading
+ - Nothing specific to this release, but please see 2.0.7 if you are upgrading
from a previous version.