Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/017ec3ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/017ec3ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/017ec3ae Branch: refs/heads/trunk Commit: 017ec3ae0f8255ba4d93162a69a54f2e15049f24 Parents: e90489f 44ed78a Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 25 12:58:26 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 25 12:58:26 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +++- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/017ec3ae/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index cbcb57f,941e700..b100c68 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,6 +1,11 @@@ +3.0 + * Remove CQL2 (CASSANDRA-5918) + * add Thrift get_multi_slice call (CASSANDRA-6757) + + 2.1.0-beta2 + * Fail write instead of logging a warning when unable to append to CL + (CASSANDRA-6764) * Eliminate possibility of CL segment appearing twice in active list (CASSANDRA-6557) * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
