cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [14/15] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Tue, 27 Nov 2012 15:04:45 GMT
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/041cd867
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/041cd867
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/041cd867

Branch: refs/heads/trunk
Commit: 041cd867aa2fa4c59ae7cd4d84fe285ed7e81361
Parents: cc08489 24cf1d1
Author: Vijay Parthasarathy <vijay2win@gmail.com>
Authored: Tue Nov 27 00:27:45 2012 -0800
Committer: Vijay Parthasarathy <vijay2win@gmail.com>
Committed: Tue Nov 27 00:27:45 2012 -0800

----------------------------------------------------------------------
 conf/cassandra.yaml                                |    6 +----
 .../org/apache/cassandra/cli/CliSessionState.java  |    3 +-
 src/java/org/apache/cassandra/config/Config.java   |    8 ++++--
 .../cassandra/config/DatabaseDescriptor.java       |    6 +++-
 .../apache/cassandra/config/EncryptionOptions.java |   18 +++++++++-----
 .../org/apache/cassandra/net/MessagingService.java |    4 +-
 .../apache/cassandra/thrift/CustomTHsHaServer.java |    3 +-
 .../cassandra/thrift/CustomTNonBlockingServer.java |    3 +-
 .../cassandra/thrift/CustomTThreadPoolServer.java  |    7 ++---
 .../src/org/apache/cassandra/stress/Session.java   |    3 +-
 10 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------



Mime
View raw message