cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Mon, 29 Feb 2016 17:20:49 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63285908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63285908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63285908

Branch: refs/heads/cassandra-3.0
Commit: 6328590808ff16fd026fd80cb28635d4313b8cc8
Parents: a20a0f7 a24bd6c
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Feb 29 17:19:19 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Feb 29 17:19:19 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +-
 .../apache/cassandra/security/SSLFactory.java   |  41 ++++++----
 .../thrift/CustomTThreadPoolServer.java         |   4 +-
 .../org/apache/cassandra/transport/Server.java  |   3 +-
 .../cassandra/transport/SimpleClient.java       |   3 +-
 test/conf/keystore.jks                          | Bin 0 -> 2191 bytes
 .../cassandra/security/SSLFactoryTest.java      |  75 +++++++++++++++++++
 7 files changed, 108 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63285908/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ba3d2fd,103ac16..a7b5c8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 -2.2.6
 +3.0.4
+  * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
 + * MV should only query complex columns included in the view (CASSANDRA-11069)
 + * Failed aggregate creation breaks server permanently (CASSANDRA-11064)
 + * Add sstabledump tool (CASSANDRA-7464)
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries (CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 + * Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
 +Merged from 2.2:
   * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
   * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
@@@ -50,48 -30,12 +51,47 @@@ Merged from 2.1
   * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
   * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
 - * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
 - * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
 + * (cqlsh) Display milliseconds when datetime overflows (CASSANDRA-10625)
  
  
 -2.2.5
 +3.0.3
 + * Remove double initialization of newly added tables (CASSANDRA-11027)
 + * Filter keys searcher results by target range (CASSANDRA-11104)
 + * Fix deserialization of legacy read commands (CASSANDRA-11087)
 + * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
 + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
 + * Mutations do not block for completion under view lock contention (CASSANDRA-10779)
 + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
 + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
 +   (CASSANDRA-11003)
 + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
 + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
 + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
 + * Added support for IBM zSystems architecture (CASSANDRA-11054)
 + * Update CQL documentation (CASSANDRA-10899)
 + * Check the column name, not cell name, for dropped columns when reading
 +   legacy sstables (CASSANDRA-11018)
 + * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
 + * Remove checksum files after replaying hints (CASSANDRA-10947)
 + * Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
 +Merged from 2.2:
- 2.2.5
   * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
   * Apply change to compaction throughput in real time (CASSANDRA-10025)
   * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63285908/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------


Mime
View raw message