Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90783a11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90783a11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90783a11 Branch: refs/heads/trunk Commit: 90783a11268ec685c564a702c0a11b5f9b191a67 Parents: 5c50d31 51a5106 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 13:17:34 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 13:17:34 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/90783a11/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9e07e98,95ab69e..1da57cf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -26,8 -26,9 +26,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/90783a11/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
