Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1AA811EC2 for ; Tue, 15 Jul 2014 17:21:30 +0000 (UTC) Received: (qmail 2352 invoked by uid 500); 15 Jul 2014 17:21:30 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 2311 invoked by uid 500); 15 Jul 2014 17:21:30 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 2286 invoked by uid 99); 15 Jul 2014 17:21:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jul 2014 17:21:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 612D494DE79; Tue, 15 Jul 2014 17:21:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Tue, 15 Jul 2014 17:21:31 -0000 Message-Id: In-Reply-To: <64f1966f2e784b5db2a3fbccd95442d0@git.apache.org> References: <64f1966f2e784b5db2a3fbccd95442d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 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 Authored: Tue Jul 15 18:21:01 2014 +0100 Committer: Benedict Elliott Smith Committed: Tue Jul 15 18:21:01 2014 +0100 ---------------------------------------------------------------------- .../cassandra/concurrent/SharedExecutorPool.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) ----------------------------------------------------------------------