You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/03 00:20:55 UTC
[1/7] git commit: Merge #3839
Updated Branches:
refs/heads/trunk 8fb8343a9 -> 332e5a511
Merge #3839
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/332e5a51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/332e5a51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/332e5a51
Branch: refs/heads/trunk
Commit: 332e5a5110eb311b31f95550ed4ec00c7dcbff54
Parents: 8fb8343 cba4087
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 2 17:12:20 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 2 17:12:20 2012 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 12 ++++++++++++
.../org/apache/cassandra/cql/jdbc/JdbcDate.java | 12 +++++++++---
.../apache/cassandra/hadoop/BulkRecordWriter.java | 4 ++--
.../cassandra/net/OutboundTcpConnectionPool.java | 11 +++++++++--
.../org/apache/cassandra/security/SSLFactory.java | 10 ++++++++++
.../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 7 ++++++-
6 files changed, 48 insertions(+), 8 deletions(-)
----------------------------------------------------------------------