cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Tue, 25 Oct 2016 02:04:25 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/9d4fd903
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d4fd903
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d4fd903

Branch: refs/heads/trunk
Commit: 9d4fd903fb1888cbbaca85d43458fda0b10dac22
Parents: b921ddf 13b7362
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue Oct 25 10:03:37 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Tue Oct 25 10:03:37 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt  | 1 +
 bin/cqlsh.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d4fd903/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8504e0b,ef728c7..7b2666d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,9 +1,18 @@@
 +4.0
 + * 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)
 +Merged from 3.0:
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
+  * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
   * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 - * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
   * Add duration data type (CASSANDRA-11873)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
   * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876
(CASSANDRA-12761)


Mime
View raw message