Fix 2.0.2 changes pending re-roll
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc01b316 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc01b316 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc01b316 Branch: refs/heads/trunk Commit: cc01b3165fa8ac91613e9b7987dcca38797df0ec Parents: f97eeac Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Oct 23 10:35:56 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Oct 23 10:35:56 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc01b316/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ece28ab..b55e0cf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,15 +1,3 @@ -2.0.3 - * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) - * Fix NPE while loading paxos state (CASSANDRA-6211) - * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228) -Merged from 1.2: - * Fix altering column types (CASSANDRA-6185) - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) - * add windows bat files for shell commands (CASSANDRA-6145) - * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) - * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214) - - 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149) @@ -39,6 +27,9 @@ Merged from 1.2: * Add reloadtriggers command to nodetool (CASSANDRA-4949) * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) * Fix sstable loader (CASSANDRA-6205) + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) + * Fix NPE while loading paxos state (CASSANDRA-6211) + * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228) Merged from 1.2: * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) @@ -76,6 +67,11 @@ Merged from 1.2: * Rework token replacement to use replace_address (CASSANDRA-5916) * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) + * Fix altering column types (CASSANDRA-6185) + * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) + * add windows bat files for shell commands (CASSANDRA-6145) + * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) + * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214) 2.0.1