Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d854911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d854911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d854911 Branch: refs/heads/trunk Commit: 3d854911c64a28e9c3bc46be493bc54f3ec1ebec Parents: 24bdd00 b687195 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Dec 1 20:18:43 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Dec 1 20:18:43 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d854911/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 81ba65a,4e77faa..6d5b5d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,8 -3,8 +20,9 @@@ * 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) + * Add snapshot space used to cfstats (CASSANDRA-6231) * 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) * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
