cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 04 Feb 2016 18:34:40 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b51f9495e5f1dc9573aa08139009569a1916f82f
Parents: c164e51 f340362
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Feb 4 19:32:41 2016 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Feb 4 19:33:21 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                      |   3 +++
 ...-core-3.0.0-beta1-bb1bce4-SNAPSHOT-shaded.jar | Bin 2288891 -> 0 bytes
 lib/cassandra-driver-core-3.0.0-shaded.jar       | Bin 0 -> 2433676 bytes
 .../cassandra/cql3/functions/UDHelper.java       |   2 +-
 .../cassandra/hadoop/cql3/CqlConfigHelper.java   |  10 +++++++---
 .../org/apache/cassandra/tools/BulkLoader.java   |   6 +++++-
 .../cassandra/cql3/IndexQueryPagingTest.java     |   3 ++-
 .../cql3/validation/entities/UFTest.java         |   8 ++++----
 .../cassandra/stress/util/JavaDriverClient.java  |   8 +++++---
 9 files changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51f9495/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f53393d,21ae788..1d2fbb7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,26 @@@
 -3.0.4
 +3.4
 + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
++Merged from 3.0:
+  * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
+ 
  
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
 +Merged from 3.0:
   * 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)


Mime
View raw message