Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d677e790 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d677e790 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d677e790 Branch: refs/heads/cassandra-2.1 Commit: d677e790d220ce4249d394bf87cd0bd7479ba7cc Parents: d213326 0bbfabb Author: Sylvain Lebresne <[email protected]> Authored: Mon Jun 30 16:47:48 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jun 30 16:47:48 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d677e790/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c912094,46e7475..5b6b4eb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -17,8 -11,9 +17,10 @@@ Merged from 2.0 * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) * Commit disk failure policy (CASSANDRA-7429) * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + 2.1.0-rc2 * Fix heap size calculation for CompoundSparseCellName and CompoundSparseCellName.WithCollection (CASSANDRA-7421)
