Return-Path: X-Original-To: apmail-storm-commits-archive@minotaur.apache.org Delivered-To: apmail-storm-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 1DF7610848 for ; Mon, 23 Jun 2014 15:19:36 +0000 (UTC) Received: (qmail 75070 invoked by uid 500); 23 Jun 2014 15:19:36 -0000 Delivered-To: apmail-storm-commits-archive@storm.apache.org Received: (qmail 75012 invoked by uid 500); 23 Jun 2014 15:19:36 -0000 Mailing-List: contact commits-help@storm.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@storm.incubator.apache.org Delivered-To: mailing list commits@storm.incubator.apache.org Received: (qmail 74910 invoked by uid 99); 23 Jun 2014 15:19:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jun 2014 15:19:35 +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; Mon, 23 Jun 2014 15:19:33 +0000 Received: (qmail 71909 invoked by uid 99); 23 Jun 2014 15:19: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; Mon, 23 Jun 2014 15:19:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 914E8887B90; Mon, 23 Jun 2014 15:19:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bobby@apache.org To: commits@storm.incubator.apache.org Date: Mon, 23 Jun 2014 15:19:19 -0000 Message-Id: <326a2e8aaab3485ea70d932c0b1f8c52@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/22] git commit: Merge branch 'master' of https://github.com/aaronzimmerman/incubator-storm into storm-337 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://github.com/aaronzimmerman/incubator-storm into storm-337 STORM-337: Expose managed spout ids publicly Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/1a57aa8f Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/1a57aa8f Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/1a57aa8f Branch: refs/heads/security Commit: 1a57aa8fd0e8d53114da9435a61f319014dbb428 Parents: a821d5c 2d64f7e Author: Derek Dagit Authored: Thu Jun 19 16:37:01 2014 -0500 Committer: Derek Dagit Committed: Thu Jun 19 16:37:01 2014 -0500 ---------------------------------------------------------------------- .../src/jvm/storm/trident/topology/MasterBatchCoordinator.java | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------