cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: 4c728d2e48936ba9721926607f79a462925364c9
Parents: 9d4fd90 8644aa9
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Tue Oct 25 12:13:41 2016 +0200
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Tue Oct 25 12:13:53 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 build.xml                      | 2 +-
 pylib/cqlshlib/cql3handling.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c728d2e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b2666d,e6477d7..f9e3e34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,6 +1,15 @@@
 +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
+  * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
+  * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c728d2e/build.xml
----------------------------------------------------------------------


Mime
View raw message