merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a3796f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3796f5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3796f5f Branch: refs/heads/trunk Commit: a3796f5f7d9473452dd856aad3d99940eb307716 Parents: c960975 a3d91dc Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Dec 13 22:11:31 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Dec 13 22:11:31 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../cassandra/locator/AbstractReplicationStrategy.java | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3796f5f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 182bada,e586592..a54231e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,10 +1,18 @@@ -1.2.13 +2.0.4 + * 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 sub-ms 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) + * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) +Merged from 1.2: - * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345) + * Randomize batchlog candidates selection (CASSANDRA-6481) + * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485) - * 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 statement has more markers than supported http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3796f5f/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java ----------------------------------------------------------------------
