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