Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197b3a83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/197b3a83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/197b3a83 Branch: refs/heads/trunk Commit: 197b3a83ac553b43afbeaa435469fb066f761877 Parents: 69d559a 0c37db6 Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 26 17:46:30 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 26 17:46:30 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/197b3a83/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/197b3a83/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
