Updated Branches: refs/heads/trunk be3a22906 -> 43f7a776f
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/43f7a776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43f7a776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43f7a776 Branch: refs/heads/trunk Commit: 43f7a776fc7ace2c61637c552c0cf7f08a40f02e Parents: be3a229 114651b Author: Sylvain Lebresne <[email protected]> Authored: Thu Nov 29 10:20:39 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Nov 29 10:20:39 2012 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 9 ++++++--- src/java/org/apache/cassandra/config/Config.java | 3 ++- .../cassandra/config/DatabaseDescriptor.java | 5 +++++ .../transport/RequestThreadPoolExecutor.java | 13 +++++++------ .../org/apache/cassandra/transport/Server.java | 2 ++ .../apache/cassandra/transport/SimpleClient.java | 2 ++ src/java/org/apache/cassandra/utils/UUIDGen.java | 9 ++++----- .../unit/org/apache/cassandra/utils/UUIDTests.java | 12 ++++++++++++ 8 files changed, 40 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
