You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/02/23 11:17:02 UTC
[13/13] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e5c63d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e5c63d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e5c63d7
Branch: refs/heads/trunk
Commit: 3e5c63d72e104595b930a45fd827cfa5edf6af36
Parents: 5a4ff90 b3aa334
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 23 11:15:11 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 23 11:15:11 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/3e5c63d7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f66d959,a6ded6f..51b2241
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -58,8 -30,8 +58,9 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
Merged from 2.1:
+ * Only notify if repair status changed (CASSANDRA-11172)
* 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/3e5c63d7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------