Repository: cassandra Updated Branches: refs/heads/trunk 8c0aa9927 -> f04b775dc
Fix ticket number in CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/294c0116 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/294c0116 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/294c0116 Branch: refs/heads/trunk Commit: 294c0116d94682e3a6ad6f5778475fa047f2aca0 Parents: 8845c51 Author: Tyler Hobbs <ty...@datastax.com> Authored: Fri Apr 11 16:43:06 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Fri Apr 11 16:43:06 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/294c0116/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9edd705..451d046 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -63,10 +63,10 @@ Merged from 1.2: 2.0.6 * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) - * Pool CqlRecordWriter clients by inetaddress rather than Range + * Pool CqlRecordWriter clients by inetaddress rather than Range (CASSANDRA-6665) * Fix compaction_history timestamps (CASSANDRA-6784) - * Compare scores of full replica ordering in DES (CASSANDRA-6883) + * Compare scores of full replica ordering in DES (CASSANDRA-6683) * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577) * Allow repairing between specific replicas (CASSANDRA-6440) * Allow per-dc enabling of hints (CASSANDRA-6157)