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 F154217410 for ; Thu, 12 Mar 2015 12:17:00 +0000 (UTC) Received: (qmail 66520 invoked by uid 500); 12 Mar 2015 12:16:26 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 66501 invoked by uid 500); 12 Mar 2015 12:16:26 -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 66492 invoked by uid 99); 12 Mar 2015 12:16:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Mar 2015 12:16:26 +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; Thu, 12 Mar 2015 12:16:24 +0000 Received: (qmail 66252 invoked by uid 99); 12 Mar 2015 12:16:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Mar 2015 12:16:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 81C14E18E1; Thu, 12 Mar 2015 12:16:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sblackmon@apache.org To: commits@streams.incubator.apache.org Date: Thu, 12 Mar 2015 12:16:05 -0000 Message-Id: <528e3997c6e740b199aa5848ab5d2552@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-streams git commit: Merge branch 'STREAMS-283' of https://github.com/robdouglas/incubator-streams into asf-master X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'STREAMS-283' of https://github.com/robdouglas/incubator-streams into asf-master Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6d120b2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/6d120b2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/6d120b2a Branch: refs/heads/master Commit: 6d120b2ac72e93953a1920712f3cbd20d8c4a68c Parents: 78a49ee ef2b167 Author: Steve Blackmon (@steveblackmon) Authored: Thu Mar 12 05:14:16 2015 -0700 Committer: Steve Blackmon (@steveblackmon) Committed: Thu Mar 12 05:14:16 2015 -0700 ---------------------------------------------------------------------- .../monitoring/tasks/BroadcastMonitorThread.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6d120b2a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java ----------------------------------------------------------------------