Repository: cassandra Updated Branches: refs/heads/trunk 656d93e4b -> 22cb05438
Fix CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21db1a05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21db1a05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21db1a05 Branch: refs/heads/trunk Commit: 21db1a057bc71505735ed450f6a9852f99908b56 Parents: 23402f4 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Aug 4 21:19:12 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Aug 4 21:19:12 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21db1a05/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f3654f7..3471bcc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -61,12 +61,6 @@ Merged from 1.2: are broken (CASSANDRA-7059) Merged from 1.2: * Expose global ColumnFamily metrics (CASSANDRA-7273) -||||||| merged common ancestors -1.2.17 -======= - -1.2.17 ->>>>>>> cassandra-1.2 * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399) * Expose global ColumnFamily metrics (CASSANDRA-7273) * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
