Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24af3525 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24af3525 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24af3525 Branch: refs/heads/cassandra-2.0 Commit: 24af3525f2f036ba116941cee94a56f1d0e46e07 Parents: 886ac6a 3de8454 Author: Jason Brown <jasedbr...@gmail.com> Authored: Fri Jan 17 15:12:22 2014 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Fri Jan 17 15:12:22 2014 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24af3525/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 80bc626,0b49665..d165c8b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,29 -12,10 +16,30 @@@ Merged from 1.2 * Avoid StackOverflow when using large IN queries (CASSANDRA-6567) * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589) * Paginate batchlog replay (CASSANDRA-6569) + * skip blocking on streaming during drain (CASSANDRA-6603) -1.2.13 +2.0.4 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418) + * add StorageService.stopDaemon() (CASSANDRA-4268) + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) + * add client encryption support to sstableloader (CASSANDRA-6378) + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483) + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008) + * Fix cleanup ClassCastException (CASSANDRA-6462) + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410) + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218) + * Fix divide-by-zero in PCI (CASSANDRA-6403) + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284) + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395) + * Expose a total memtable size metric for a CF (CASSANDRA-6391) + * cqlsh: handle symlinks properly (CASSANDRA-6425) + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464) + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447) + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527) +Merged from 1.2: * Improved error message on bad properties in DDL queries (CASSANDRA-6453) * Randomize batchlog candidates selection (CASSANDRA-6481) * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)