Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 621f446ca -> 66d1b8f22 refs/heads/cassandra-3.5 965ee082d -> bec103826 refs/heads/trunk 2d420e6c2 -> c19910419
Move fixes for 3.0.5 under the correct version Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66d1b8f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66d1b8f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66d1b8f2 Branch: refs/heads/cassandra-3.0 Commit: 66d1b8f22735a7b22e4a209afcefcc5743873f4a Parents: 621f446 Author: Yuki Morishita <[email protected]> Authored: Wed Mar 2 16:32:25 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Mar 2 16:32:25 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d1b8f2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 819fa22..0c721e8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,11 @@ +3.0.5 +Merged from 2.2: + * Only log yaml config once, at startup (CASSANDRA-11217) + * Reference leak with parallel repairs on the same table (CASSANDRA-11215) +Merged from 2.1: + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) + + 3.0.4 * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) * MV should only query complex columns included in the view (CASSANDRA-11069) @@ -21,8 +29,6 @@ properly (CASSANDRA-11050) * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239) Merged from 2.2: - * Only log yaml config once, at startup (CASSANDRA-11217) - * Reference leak with parallel repairs on the same table (CASSANDRA-11215) * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216) * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167) * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840) @@ -43,7 +49,6 @@ Merged from 2.2: (CASSANDRA-10010) * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: - * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371) * Only notify if repair status changed (CASSANDRA-11172) * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
