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/11/03 18:00:57 UTC
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/623aa6fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/623aa6fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/623aa6fe
Branch: refs/heads/trunk
Commit: 623aa6fe76af358391f9c7f185fb7f28376a6c7e
Parents: 5160c91 5548bf4
Author: Brandon Williams <br...@apache.org>
Authored: Mon Nov 3 10:59:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Nov 3 10:59:56 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 13 ++++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 32083cc,0ec3ff1..b9b92fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.12:
+2.1.2
+ * Refactor how we track live size (CASSANDRA-7852)
+ * Make sure unfinished compaction files are removed (CASSANDRA-8124)
+ * Fix shutdown when run as Windows service (CASSANDRA-8136)
+ * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
+ * Fix race in RecoveryManagerTest (CASSANDRA-8176)
+ * Avoid IllegalArgumentException while sorting sstables in
+ IndexSummaryManager (CASSANDRA-8182)
+ * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
+ * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
+ * Fix installing as service on Windows (CASSANDRA-8115)
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
+ * Improve client notification that nodes are ready for requests (CASSANDRA-7510)
* Handle negative timestamp in writetime method (CASSANDRA-8139)
* Pig: Remove errant LIMIT clause in CqlNativeStorage (CASSANDRA-8166)
* Throw ConfigurationException when hsha is used with the default
http://git-wip-us.apache.org/repos/asf/cassandra/blob/623aa6fe/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------