Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e66896b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e66896b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e66896b1 Branch: refs/heads/trunk Commit: e66896b1d326c49ee8b7b20ef343490370ba968f Parents: 8a2d8a1 ca43188 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Tue Jul 15 18:21:01 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Tue Jul 15 18:21:01 2014 +0100 ---------------------------------------------------------------------- .../cassandra/concurrent/SharedExecutorPool.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
