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/70d0d5f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d0d5f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70d0d5f2 Branch: refs/heads/trunk Commit: 70d0d5f2cbe0b211b65fa7ee26b8c82e4d801fd9 Parents: 1f8516d 42ea6e1 Author: T Jake Luciani <j...@apache.org> Authored: Thu Jun 18 14:47:47 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Jun 18 14:47:47 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/format/SSTableReader.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70d0d5f2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fb44c9a,9ae0969..b96a2b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,6 +1,16 @@@ -2.1.7 +2.2 + * Rename class for DATE type in Java driver (CASSANDRA-9563) + * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475) + * Fix connection leak in CqlRecordWriter (CASSANDRA-9576) + * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) + * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) + * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) + * Fix deprecated repair JMX API (CASSANDRA-9570) + * Add logback metrics (CASSANDRA-9378) +Merged from 2.1: + * Fix bug in cardinality check when compacting (CASSANDRA-9580) * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549) + * Make rebuild only run one at a time (CASSANDRA-9119) Merged from 2.0 * Expose some internals of SelectStatement for inspection (CASSANDRA-9532) * ArrivalWindow should use primitives (CASSANDRA-9496)