cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [12/13] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 23 Feb 2016 10:17:01 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b3aa33478f2bce10ae6074e6dbf389c300fc27d3
Parents: ef32b8e c8c8cf6
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Feb 23 11:14:59 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Tue Feb 23 11:14:59 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                              |  1 +
 .../cassandra/db/compaction/CompactionManager.java       | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3aa3347/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0c01009,767eb8a..a6ded6f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -31,6 -16,8 +31,7 @@@ Merged from 2.2
   * Fix paging on DISTINCT queries repeats result when first row in partition changes
     (CASSANDRA-10010)
  Merged from 2.1:
+  * Only notify if repair status changed (CASSANDRA-11172)
 - * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3aa3347/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message