cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Date Thu, 24 Mar 2016 11:29:05 GMT
Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 0a016ea1b4e057d093a9fb3866b4e0b579329213
Parents: 9b7d573 3fda52f
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Thu Mar 24 11:24:25 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Thu Mar 24 11:24:25 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../restrictions/PrimaryKeyRestrictionSet.java  | 17 +++++-
 .../restrictions/SingleColumnRestriction.java   |  8 +--
 .../restrictions/StatementRestrictions.java     |  2 +-
 .../unit/org/apache/cassandra/SchemaLoader.java | 42 +++++---------
 .../cassandra/index/sasi/SASIIndexTest.java     | 61 ++++++++++++--------
 6 files changed, 75 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a016ea1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5db2ba7,7441abd..12f7aba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +3.6
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
 + * COPY TO should have higher double precision (CASSANDRA-11255)
 + * Stress should exit with non-zero status after failure (CASSANDRA-10340)
 + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
 + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
 + * Store repair options in parent_repair_history (CASSANDRA-11244)
 + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
 + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
 + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
 + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
 + * Refuse to start and print txn log information in case of disk
 +   corruption (CASSANDRA-10112)
 + * Resolve some eclipse-warnings (CASSANDRA-11086)
 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
 + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 +
 +
  3.5
+  * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397)
  Merged from 3.0:
   * Allocate merkletrees with the correct size (CASSANDRA-11390)
   * Support streaming pre-3.0 sstables (CASSANDRA-10990)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a016ea1/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
----------------------------------------------------------------------


Mime
View raw message