Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24DFA10E50 for ; Wed, 19 Nov 2014 20:50:34 +0000 (UTC) Received: (qmail 50235 invoked by uid 500); 19 Nov 2014 20:50:34 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 50182 invoked by uid 500); 19 Nov 2014 20:50:34 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 50101 invoked by uid 99); 19 Nov 2014 20:50:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 20:50:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Nov 2014 20:50:33 +0000 Received: (qmail 49421 invoked by uid 99); 19 Nov 2014 20:50:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 20:50:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A3CB194530E; Wed, 19 Nov 2014 20:50:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rebanks@apache.org To: commits@streams.incubator.apache.org Date: Wed, 19 Nov 2014 20:50:13 -0000 Message-Id: <0efc6acac4fc4a0682835130995a7a53@git.apache.org> In-Reply-To: <810cf4d2bd1b4001a9a5bb805ff6468a@git.apache.org> References: <810cf4d2bd1b4001a9a5bb805ff6468a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-streams git commit: Merge remote-tracking branch 'robdouglas/STREAMS-216' X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'robdouglas/STREAMS-216' Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/39622e2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/39622e2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/39622e2c Branch: refs/heads/master Commit: 39622e2c0cf42784015f1ecb64308c49ae5b9772 Parents: 31ba80f 8368755 Author: Ryan Ebanks Authored: Wed Nov 19 14:30:24 2014 -0600 Committer: Ryan Ebanks Committed: Wed Nov 19 14:30:24 2014 -0600 ---------------------------------------------------------------------- .../local/counters/StreamsTaskCounterTest.java | 21 +++++++++++--------- .../queues/ThroughputQueueMulitThreadTest.java | 5 ++++- 2 files changed, 16 insertions(+), 10 deletions(-) ----------------------------------------------------------------------