You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/07/07 22:49:39 UTC
[1/3] cassandra git commit: cqlsh: Make SSL protocol version
configurable
Repository: cassandra
Updated Branches:
refs/heads/trunk 9423109de -> 6af030a95
cqlsh: Make SSL protocol version configurable
Patch by Jesse Szwedko; reviewed by Tyler Hobbs for CASSANDRA-9544
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30df089d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30df089d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30df089d
Branch: refs/heads/trunk
Commit: 30df089d72d7d9889eebacd8c00537e46a2bcaab
Parents: 4c94ef2
Author: Jesse Szwedko <je...@gmail.com>
Authored: Tue Jul 7 12:12:49 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Jul 7 15:47:57 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pylib/cqlshlib/sslhandling.py | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/30df089d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cbc7c4..0fbadbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.9
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
Merged from 2.0:
* Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/30df089d/pylib/cqlshlib/sslhandling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/sslhandling.py b/pylib/cqlshlib/sslhandling.py
index 70dd759..2a90e26 100644
--- a/pylib/cqlshlib/sslhandling.py
+++ b/pylib/cqlshlib/sslhandling.py
@@ -19,6 +19,7 @@ import sys
import ConfigParser
import ssl
+
def ssl_settings(host, config_file, env=os.environ):
"""
Function wcich generates SSL setting for cassandra.Cluster
@@ -51,6 +52,17 @@ def ssl_settings(host, config_file, env=os.environ):
ssl_validate = get_option('ssl', 'validate')
ssl_validate = ssl_validate is None or ssl_validate.lower() != 'false'
+ ssl_version_str = env.get('SSL_VERSION')
+ if ssl_version_str is None:
+ ssl_version_str = get_option('ssl', 'version')
+ if ssl_version_str is None:
+ ssl_version_str = "TLSv1"
+
+ ssl_version = getattr(ssl, "PROTOCOL_%s" % ssl_version_str, None)
+ if ssl_version is None:
+ sys.exit("%s is not a valid SSL protocol, please use one of SSLv23, "
+ "TLSv1, TLSv1.1, or TLSv1.2" % (ssl_version_str,))
+
ssl_certfile = env.get('SSL_CERTFILE')
if ssl_certfile is None:
ssl_certfile = get_option('certfiles', host)
@@ -73,6 +85,5 @@ def ssl_settings(host, config_file, env=os.environ):
return dict(ca_certs=ssl_certfile,
cert_reqs=ssl.CERT_REQUIRED if ssl_validate else ssl.CERT_NONE,
- ssl_version=ssl.PROTOCOL_TLSv1,
+ ssl_version=ssl_version,
keyfile=userkey, certfile=usercert)
-
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6af030a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6af030a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6af030a9
Branch: refs/heads/trunk
Commit: 6af030a9569d9cdd9c8f5715c9550b8ea30f1f54
Parents: 9423109 12ff1cd
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Jul 7 15:49:29 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Jul 7 15:49:29 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pylib/cqlshlib/sslhandling.py | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6af030a9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9dee57d,864eed2..3b21b52
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,22 @@@
-2.2.0-rc3
+3.0
+ * Storage engine refactor (CASSANDRA-8099, 9743)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499)
Merged from 2.0:
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
* Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12ff1cda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12ff1cda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12ff1cda
Branch: refs/heads/trunk
Commit: 12ff1cda7027f76c9b649f674d1e99459164a3fe
Parents: 0f5dd22 30df089
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Jul 7 15:49:00 2015 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Jul 7 15:49:00 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
pylib/cqlshlib/sslhandling.py | 15 +++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/12ff1cda/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a863ad8,0fbadbc..864eed2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,14 +1,35 @@@
-2.1.9
+2.2.0-rc3
+Merged from 2.0:
+ * (cqlsh) Allow the SSL protocol version to be specified through the
+ config file or environment variables (CASSANDRA-9544)
-Merged from 2.0:
- * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
-2.1.8
+2.2.0-rc2
+ * Re-enable memory-mapped I/O on Windows (CASSANDRA-9658)
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * (cqlsh) Allow setting the initial connection timeout (CASSANDRA-9601)
+ * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Update cqlsh for UDFs (CASSANDRA-7556)
+ * Change Windows kernel default timer resolution (CASSANDRA-9634)
+ * Deprected sstable2json and json2sstable (CASSANDRA-9618)
+ * Allow native functions in user-defined aggregates (CASSANDRA-9542)
+ * Don't repair system_distributed by default (CASSANDRA-9621)
+ * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622)
+ * Rename class for DATE type in Java driver (CASSANDRA-9563)
+ * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475)
+ * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
+ * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229)
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
+ * Fix deprecated repair JMX API (CASSANDRA-9570)
+ * Add logback metrics (CASSANDRA-9378)
+ * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583)
+ * Fix upgrading to new directory for secondary index (CASSANDRA-9687)
+Merged from 2.1:
* (cqlsh) Fix bad check for CQL compatibility when DESCRIBE'ing
COMPACT STORAGE tables with no clustering columns
- * Warn when an extra-large partition is compacted (CASSANDRA-9643)
* Eliminate strong self-reference chains in sstable ref tidiers (CASSANDRA-9656)
* Ensure StreamSession uses canonical sstable reader instances (CASSANDRA-9700)
* Ensure memtable book keeping is not corrupted in the event we shrink usage (CASSANDRA-9681)