You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/03/13 22:33:57 UTC
[1/8] git commit: Load a truststore if client certificate
authentication is enabled
Repository: cassandra
Updated Branches:
refs/heads/trunk 67feb71ee -> 17af71ee3
Load a truststore if client certificate authentication is enabled
patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/173df48b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/173df48b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/173df48b
Branch: refs/heads/trunk
Commit: 173df48bb36402bf59accb02537450703b8eedd8
Parents: 52cf09d
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 11:27:43 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:05:31 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/173df48b/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index 0ffb92b..5773728 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -257,7 +257,7 @@ public class Server implements CassandraDaemon.Server
this.encryptionOptions = encryptionOptions;
try
{
- this.sslContext = SSLFactory.createSSLContext(encryptionOptions, false);
+ this.sslContext = SSLFactory.createSSLContext(encryptionOptions, encryptionOptions.require_client_auth);
}
catch (IOException e)
{
[4/8] git commit: Adjusted cqlshlib tests for CASSANDRA-6745
Posted by mi...@apache.org.
Adjusted cqlshlib tests for CASSANDRA-6745
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3f40fd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3f40fd7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3f40fd7
Branch: refs/heads/trunk
Commit: c3f40fd7b34e35a6438a2b06d78827173cd2eca4
Parents: 51220ff
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 13:27:26 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:27:26 2014 -0700
----------------------------------------------------------------------
pylib/cqlshlib/test/test_cqlsh_output.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3f40fd7/pylib/cqlshlib/test/test_cqlsh_output.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py b/pylib/cqlshlib/test/test_cqlsh_output.py
index f3e9b57..212f847 100644
--- a/pylib/cqlshlib/test/test_cqlsh_output.py
+++ b/pylib/cqlshlib/test/test_cqlsh_output.py
@@ -652,7 +652,7 @@ class TestCqlshOutput(BaseTestCase):
varcharcol text,
varintcol varint
) WITH bloom_filter_fp_chance = 0.01
- AND caching = 'KEYS_ONLY'
+ AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
AND comment = ''
AND compaction = {'min_threshold': '4', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32'}
AND compression = {'sstable_compression': 'org.apache.cassandra.io.compress.LZ4Compressor'}
@@ -663,7 +663,6 @@ class TestCqlshOutput(BaseTestCase):
AND min_index_interval = 128
AND populate_io_cache_on_flush = false
AND read_repair_chance = 0.1
- AND rows_per_partition_to_cache = '100'
AND speculative_retry = '99.0PERCENTILE';
""" % quote_name(get_test_keyspace()))
[2/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dce55999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce55999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce55999
Branch: refs/heads/trunk
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:05:52 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
[7/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f49df8c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49df8c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49df8c9
Branch: refs/heads/trunk
Commit: f49df8c9b0e37bb23e981c3ce2cb17735051e068
Parents: c3f40fd 3dcc8c2
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 14:07:15 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 14:07:15 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49df8c9/bin/cqlsh
----------------------------------------------------------------------
[8/8] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17af71ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17af71ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17af71ee
Branch: refs/heads/trunk
Commit: 17af71ee31c084a470dead4144a1cfc73dc3bd0a
Parents: 67feb71 f49df8c
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 14:33:46 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 14:33:46 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 3 ++-
pylib/cqlshlib/test/test_cqlsh_output.py | 3 +--
src/java/org/apache/cassandra/transport/Server.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[3/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51220ffe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51220ffe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51220ffe
Branch: refs/heads/trunk
Commit: 51220ffe2a2b73fc976635da5464573d0cb7ea93
Parents: 4c22b16 dce5599
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 13:06:03 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 13:06:03 2014 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/transport/Server.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51220ffe/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
[6/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by mi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dcc8c25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dcc8c25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dcc8c25
Branch: refs/heads/trunk
Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f
Parents: dce5599 972d3da
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Mar 13 14:07:04 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 14:07:04 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh
----------------------------------------------------------------------
[5/8] git commit: Delimiter not working for special characters in
COPY command from CQLSH
Posted by mi...@apache.org.
Delimiter not working for special characters in COPY command from CQLSH
patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/972d3da2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972d3da2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/972d3da2
Branch: refs/heads/trunk
Commit: 972d3da2e87d2e6770ed70ab45aa9dedc0fdf779
Parents: 173df48
Author: Shiti Saxena <ss...@gmail.com>
Authored: Thu Mar 13 14:06:51 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Mar 13 14:06:51 2014 -0700
----------------------------------------------------------------------
bin/cqlsh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/972d3da2/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 5ccab3d..4bf1b76 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1635,7 +1635,8 @@ class Shell(cmd.Cmd):
fname = os.path.expanduser(self.cql_unprotect_value(fname))
copyoptnames = map(str.lower, parsed.get_binding('optnames', ()))
copyoptvals = map(self.cql_unprotect_value, parsed.get_binding('optvals', ()))
- opts = dict(zip(copyoptnames, copyoptvals))
+ cleancopyoptvals = [optval.decode('string-escape') for optval in copyoptvals]
+ opts = dict(zip(copyoptnames, cleancopyoptvals))
timestart = time.time()