Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f498a94c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f498a94c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f498a94c Branch: refs/heads/trunk Commit: f498a94cec0acb1d254bc266f408f1642d206207 Parents: f92291c 266f6b7 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 6 12:12:21 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 6 12:12:21 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f498a94c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 20330f8,2c95a52..30efd94 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ -1.2.19 +2.0.10 + * Update java driver (for hadoop) (CASSANDRA-7618) + * Fix truncate to always flush (CASSANDRA-7511) + * Remove shuffle and taketoken (CASSANDRA-7601) + * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Always merge ranges owned by a single node (CASSANDRA-6930) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541) + * Fix range merging when DES scores are zero (CASSANDRA-7535) + * Warn when SSL certificates have expired (CASSANDRA-7528) + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) + * Add option to disable STCS in L0 (CASSANDRA-6621) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) + * Backport CASSANDRA-6747 (CASSANDRA-7560) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) +Merged from 1.2: + * Add stop method to EmbeddedCassandraService (CASSANDRA-7595) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669) * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)