Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23becceb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23becceb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23becceb Branch: refs/heads/cassandra-2.0 Commit: 23becceb7b652a46fbf098882fbd01113a598e76 Parents: 18f0234 88fea9f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 7 18:05:10 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 7 18:05:10 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 4 ++-- lib/thrift-server-0.2.1.jar | Bin 123693 -> 0 bytes lib/thrift-server-0.3.0.jar | Bin 0 -> 123898 bytes .../cassandra/thrift/THsHaDisruptorServer.java | 3 ++- 5 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23becceb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4dca1b8,86401d9..30aa5e4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,11 @@@ +2.0.1 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + + 2.0.0 * fix CAS contention timeout (CASSANDRA-5830) + * fix HsHa to respect max frame size (CASSANDRA-4573) 2.0.0-rc1