Updated Branches: refs/heads/cassandra-1.2 3a92236a2 -> 114651bbb
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/114651bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/114651bb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/114651bb Branch: refs/heads/cassandra-1.2 Commit: 114651bbb0d55943343f8f83b7779def2424a2d4 Parents: 3a92236 1ef67f4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 29 10:20:17 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 29 10:20:17 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(-) ----------------------------------------------------------------------
