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, 28 Nov 2016 13:21:19 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/8fb01dd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fb01dd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fb01dd2

Branch: refs/heads/trunk
Commit: 8fb01dd21cdf06f457255bd48a47d6c461ce2a85
Parents: 2f8d907 554d536
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Nov 28 05:14:55 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Nov 28 05:17:49 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                      |   1 +
 test/conf/cassandra.keystore                     | Bin 1004 -> 972 bytes
 .../3.4-encrypted/CommitLog-6-1452918948163.log  | Bin 872373 -> 0 bytes
 .../3.4-encrypted/CommitLog-6-1480001790338.log  | Bin 0 -> 1452357 bytes
 .../3.4-encrypted/CommitLog-6-1480001790339.log  | Bin 0 -> 137 bytes
 .../data/legacy-commitlog/3.4-encrypted/hash.txt |   8 ++++----
 6 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fb01dd2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5e160a,93f9fcc..4b8eb25
--- 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)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
  3.12
+  * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
   * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
   * Add support for arithmetic operators (CASSANDRA-11935)
  


Mime
View raw message