Updated Branches: refs/heads/trunk 73e8cb62f -> 1aa9312f9
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/1aa9312f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa9312f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa9312f Branch: refs/heads/trunk Commit: 1aa9312f928edb497632a3547eb7560092f16c09 Parents: 73e8cb6 ab23afa Author: Aleksey Yeschenko <[email protected]> Authored: Thu Feb 28 00:56:24 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Feb 28 00:56:24 2013 +0300 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ++++- .../apache/cassandra/config/EncryptionOptions.java | 2 +- .../cassandra/thrift/CustomTThreadPoolServer.java | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa9312f/conf/cassandra.yaml ----------------------------------------------------------------------
