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/cf83c81d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf83c81d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf83c81d Branch: refs/heads/trunk Commit: cf83c81d85fb20b50f988c23743ba2510308bf42 Parents: b892c09 e40bc75 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Dec 4 17:56:25 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Dec 4 17:56:25 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf83c81d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a7ab215,09a3b07..d485a69 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,15 +1,20 @@@ -1.2.13 +2.0.4 + * 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 sub-ms precision formats to the timestamp parser (CASSANDRA-6395) + * Expose a total memtable size metric for a CF (CASSANDRA-6391) + * cqlsh: hanlde symlinks properly (CASSANDRA-6425) +Merged from 1.2: * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) - * Optimize FD phi calculation (CASSANDRA-6386) - * Improve initial FD phi estimate when starting up (CASSANDRA-6385) - * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172) * Improve gossip performance for typical messages (CASSANDRA-6409) - * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598) + * Throw IRE if a prepared statement has more markers than supported + (CASSANDRA-5598) * Expose Thread metrics for the native protocol server (CASSANDRA-6234) - * Change snapshot response message verb (CASSANDRA-6415) + * Change snapshot response message verb to INTERNAL to avoid dropping it + (CASSANDRA-6415) * Warn when collection read has > 65K elements (CASSANDRA-5428)