Updated Branches: refs/heads/trunk af404f211 -> 95c1ed468
Merge branch 'cassandra-1.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/95c1ed46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95c1ed46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95c1ed46 Branch: refs/heads/trunk Commit: 95c1ed468d2efa772e26b7cf3d56011284f24c72 Parents: af404f2 4460e28 Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Mon Jan 7 16:01:56 2013 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Mon Jan 7 16:01:56 2013 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 2 + .../apache/cassandra/config/EncryptionOptions.java | 1 + .../cassandra/cql3/statements/SelectStatement.java | 18 ++++++++++----- .../org/apache/cassandra/security/SSLFactory.java | 1 + .../cassandra/thrift/CustomTThreadPoolServer.java | 1 + .../org/apache/cassandra/transport/Server.java | 3 +- 7 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c1ed46/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c1ed46/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95c1ed46/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ----------------------------------------------------------------------
