Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9db5807f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9db5807f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9db5807f Branch: refs/heads/cassandra-2.1 Commit: 9db5807f435437e83642149738d2585cc945d81e Parents: f644656 5ddeba3 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 14 13:17:27 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 14 13:17:27 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/db/commitlog/CommitLogSegment.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9db5807f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 12dccec,1d7c2db..a532bdc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -21,8 -21,9 +21,10 @@@ * Fix help message for stress counter_write (CASSANDRA-6824) * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848) * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849) + * Fix race condition in Batch CLE (CASSANDRA-6860) + Merged from 2.0: + * Fix schema concurrency exceptions (CASSANDRA-6841) * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) * fix nodetool getsstables for blob PK (CASSANDRA-6803) * Fix saving triggers to schema (CASSANDRA-6789) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9db5807f/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
