Updated Branches: refs/heads/trunk 181f3736c -> 968f6471a
changes.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/968f6471 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968f6471 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/968f6471 Branch: refs/heads/trunk Commit: 968f6471abb69ec3e2d46f66a1a21eb41602872b Parents: 181f373 Author: Jason Brown <[email protected]> Authored: Tue Jul 30 13:51:14 2013 -0700 Committer: Jason Brown <[email protected]> Committed: Tue Jul 30 13:51:14 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/968f6471/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ce9490c..15223e2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,10 @@ Merged from 1.2: * update default LCS sstable size to 160MB (CASSANDRA-5727) * Allow compacting 2Is via nodetool (CASSANDRA-5670) * Hex-encode non-String keys in OPP (CASSANDRA-5793) + + +1.2.8 +>>>>>>> Allow compacting 2Is via nodetool * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) * cqlsh: add collections support to COPY (CASSANDRA-5698) * retry important messages for any IOException (CASSANDRA-5804)
