cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Wed, 12 Oct 2016 04:31:21 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/6e9c3db5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e9c3db5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e9c3db5

Branch: refs/heads/trunk
Commit: 6e9c3db56a6039f08f6748ea21b9691ac8752a4d
Parents: 8e6a58c b25d903
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Tue Oct 11 21:27:20 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Tue Oct 11 21:29:14 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../cassandra/auth/CassandraRoleManager.java    | 22 +++++++++++++++-----
 .../serializers/BooleanSerializer.java          |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e9c3db5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57ff13c,c59459c..ee109c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,3 +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)
++Merged from 2.2:
++ * Better handle invalid system roles table (CASSANDRA-12700)
 +
 +
  3.10
   * Check for hash conflicts in prepared statements (CASSANDRA-12733)
   * Exit query parsing upon first error (CASSANDRA-12598)


Mime
View raw message