Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddcd54a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddcd54a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddcd54a3 Branch: refs/heads/cassandra-2.0.0 Commit: ddcd54a3bed4b6cbf25746705afea1742e4a50c3 Parents: 65cd580 02d9238 Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 26 17:37:19 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 26 17:37:19 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 2 + .../transport/RequestThreadPoolExecutor.java | 46 ++++++++++++++++++-- 3 files changed, 45 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddcd54a3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddcd54a3/conf/cassandra.yaml ----------------------------------------------------------------------
