You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/01/02 14:08:30 UTC
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk 3a005df39 -> b7eaf009c
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/b7eaf009
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7eaf009
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7eaf009
Branch: refs/heads/trunk
Commit: b7eaf009cd2e398360ad2b80c6fbc52921193f01
Parents: 3a005df 119c726
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jan 2 14:08:18 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jan 2 14:08:18 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/security/SSLFactory.java | 40 +++++----
.../org/apache/cassandra/transport/Client.java | 26 ++++-
.../org/apache/cassandra/transport/Server.java | 73 ++++++++++++--
.../apache/cassandra/transport/SimpleClient.java | 74 +++++++++++++--
5 files changed, 173 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7eaf009/CHANGES.txt
----------------------------------------------------------------------