cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 12 Dec 2016 14:25:29 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 9c0fa054a2cc2bfb470f6d6547ae0701dd32528f
Parents: 31501cc c0e7110
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Dec 12 06:23:22 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Dec 12 06:24:52 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 .../org/apache/cassandra/stress/settings/SettingsCommand.java   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c0fa054/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fa2bf93,c4f4c1f..6e57ea7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
 +
  3.12
+  * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
   * Add mutation size and batch metrics (CASSANDRA-12649)
   * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
   * Fix primary index calculation for SASI (CASSANDRA-12910)


Mime
View raw message