cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 21 Oct 2015 12:30:58 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

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/d3085b1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3085b1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3085b1b

Branch: refs/heads/trunk
Commit: d3085b1baa33e9dc546aa80123e0cb1c17659073
Parents: f10d2ed 9d8436f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Oct 21 14:27:46 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Oct 21 14:27:46 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 debian/init | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3085b1b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 560472a,31ae1c0..120be92
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,11 +1,15 @@@
 -2.1.12
 +2.2.4
 + * Expose phi values from failure detector via JMX and tweak debug
 +   and trace logging (CASSANDRA-9526)
 + * Fix RangeNamesQueryPager (CASSANDRA-10509)
 + * Deprecate Pig support (CASSANDRA-10542)
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 +Merged from 2.1:
+  * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
   * Fix potential NPE from handling result of SIM.highestSelectivityIndex (CASSANDRA-10550)
 - * Fix paging issues with partitions containing only static columns data
 -   (CASSANDRA-10381)
 + * Fix paging issues with partitions containing only static columns data (CASSANDRA-10381)
   * Fix conditions on static columns (CASSANDRA-10264)
   * AssertionError: attempted to delete non-existing file CommitLog (CASSANDRA-10377)
 - * Merge range tombstones during compaction (CASSANDRA-7953)
   * (cqlsh) Distinguish negative and positive infinity in output (CASSANDRA-10523)
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)


Mime
View raw message