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 D7ADA17386 for ; Thu, 2 Apr 2015 21:24:02 +0000 (UTC) Received: (qmail 83944 invoked by uid 500); 2 Apr 2015 21:24:02 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 83924 invoked by uid 500); 2 Apr 2015 21:24:02 -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 83915 invoked by uid 99); 2 Apr 2015 21:24:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2015 21:24:02 +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, 02 Apr 2015 21:23:41 +0000 Received: (qmail 80744 invoked by uid 99); 2 Apr 2015 21:23:38 -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, 02 Apr 2015 21:23:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3D9CE2F5A; Thu, 2 Apr 2015 21:23:38 +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, 02 Apr 2015 21:23:39 -0000 Message-Id: <44757cb53f2a4c1e8dcd0edbadee35bc@git.apache.org> In-Reply-To: <319f0f86e7a84a7bbbb514c367392217@git.apache.org> References: <319f0f86e7a84a7bbbb514c367392217@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-streams git commit: Merge branch 'STREAMS-296.2' into asf-master X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'STREAMS-296.2' 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/51b96222 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/51b96222 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/51b96222 Branch: refs/heads/master Commit: 51b962227a5c68d7115a25af9b5353f25aaf2638 Parents: 5e995ca 1d954c5 Author: Steve Blackmon (@steveblackmon) Authored: Thu Apr 2 16:23:22 2015 -0500 Committer: Steve Blackmon (@steveblackmon) Committed: Thu Apr 2 16:23:22 2015 -0500 ---------------------------------------------------------------------- .../org/apache/streams/local/builders/LocalStreamBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------