Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3EF1DE5DE for ; Tue, 8 Jan 2013 00:02:28 +0000 (UTC) Received: (qmail 17993 invoked by uid 500); 8 Jan 2013 00:02:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 17965 invoked by uid 500); 8 Jan 2013 00:02:28 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 17955 invoked by uid 99); 8 Jan 2013 00:02:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 00:02:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C9A8811089; Tue, 8 Jan 2013 00:02:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vijay@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130108000227.C9A8811089@tyr.zones.apache.org> Date: Tue, 8 Jan 2013 00:02:27 +0000 (UTC) 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 Authored: Mon Jan 7 16:01:56 2013 -0800 Committer: Vijay Parthasarathy 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 ----------------------------------------------------------------------