cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 31 Mar 2016 14:19:17 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/067c8dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/067c8dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/067c8dfb

Branch: refs/heads/cassandra-3.0
Commit: 067c8dfbe41421283e8cf6dc3c595efb237be054
Parents: f8cc860 106750c
Author: T Jake Luciani <jake@apache.org>
Authored: Thu Mar 31 10:15:40 2016 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Thu Mar 31 10:15:40 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                       |  1 +
 .../stress/settings/SettingsTransport.java        | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/067c8dfb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 449a2b5,3e51935..eda762b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
 -2.2.6
 +3.0.5
 + * Upgrade ohc to 0.4.3
 + * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
 + * Allocate merkletrees with the correct size (CASSANDRA-11390)
 + * Support streaming pre-3.0 sstables (CASSANDRA-10990)
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Add cassandra-stress keystore option (CASSANDRA-9325)
   * Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
 - * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
   * Notify when sstables change after cancelling compaction (CASSANDRA-11373)
   * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
   * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)


Mime
View raw message