Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c37db64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c37db64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c37db64 Branch: refs/heads/trunk Commit: 0c37db648c27024f64765dcd91358a3ba695b6b8 Parents: 9f66478 741aa31 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Aug 26 17:46:13 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Aug 26 17:46:13 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 + conf/cassandra.yaml | 8 ++-- .../org/apache/cassandra/config/Config.java | 1 - .../cassandra/config/DatabaseDescriptor.java | 5 --- .../transport/RequestThreadPoolExecutor.java | 46 ++++++++++++++++++-- 6 files changed, 49 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c37db64/CHANGES.txt ----------------------------------------------------------------------