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 Thu, 13 Oct 2016 01:27:45 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/2ab4666c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab4666c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab4666c

Branch: refs/heads/trunk
Commit: 2ab4666cd396aa58d313f16f821d5b81025a6a7d
Parents: 9f75e70 a041908
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Thu Oct 13 09:26:53 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu Oct 13 09:26:53 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 bin/cqlsh.py                                    |  30 +++++++++----------
 ...driver-internal-only-3.7.0.post0-70f41b5.zip | Bin 0 -> 252036 bytes
 pylib/cqlshlib/test/test_cqlsh_output.py        |  15 ++++++++++
 4 files changed, 30 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab4666c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f001d57,f0df0e6..022166a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +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)
 +
 +
  3.10
+  * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
   * Check for hash conflicts in prepared statements (CASSANDRA-12733)
   * Exit query parsing upon first error (CASSANDRA-12598)
   * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729)


Mime
View raw message