merge from 0.7 git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1211711 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09a6ee1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09a6ee1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09a6ee1d Branch: refs/heads/trunk Commit: 09a6ee1d6b702941a4ab35c535e1a31268a030d9 Parents: 1f99610 Author: Jonathan Ellis <[email protected]> Authored: Wed Dec 7 23:52:08 2011 +0000 Committer: Jonathan Ellis <[email protected]> Committed: Wed Dec 7 23:52:08 2011 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09a6ee1d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 82311a8..f17f2ea 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -589,7 +589,6 @@ modification operations (CASSANDRA-2222) * fix for reversed slice queries on large rows (CASSANDRA-2212) * fat clients were writing local data (CASSANDRA-2223) - * turn off string interning in json2sstable (CASSANDRA-2189) * set DEFAULT_MEMTABLE_LIFETIME_IN_MINS to 24h * improve detection and cleanup of partially-written sstables (CASSANDRA-2206)
