From commits-return-1040-apmail-apex-commits-archive=apex.apache.org@apex.incubator.apache.org Sun Oct 18 06:37:03 2015 Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-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 5231718B44 for ; Sun, 18 Oct 2015 06:37:03 +0000 (UTC) Received: (qmail 46293 invoked by uid 500); 18 Oct 2015 06:37:03 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 46252 invoked by uid 500); 18 Oct 2015 06:37:03 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 46243 invoked by uid 99); 18 Oct 2015 06:37:02 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Oct 2015 06:37:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 8C951180A6C for ; Sun, 18 Oct 2015 06:37:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id HAuXP8l7aOOD for ; Sun, 18 Oct 2015 06:36:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A7BA82139D for ; Sun, 18 Oct 2015 06:36:52 +0000 (UTC) Received: (qmail 46110 invoked by uid 99); 18 Oct 2015 06:36:51 -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; Sun, 18 Oct 2015 06:36:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3E0ADFA68; Sun, 18 Oct 2015 06:36:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: thw@apache.org To: commits@apex.incubator.apache.org Date: Sun, 18 Oct 2015 06:36:52 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-apex-core git commit: Merge branch 'SPOI-5053' of https://github.com/ishark/incubator-apex-core into devel-3 Merge branch 'SPOI-5053' of https://github.com/ishark/incubator-apex-core into devel-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/d7afe728 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d7afe728 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d7afe728 Branch: refs/heads/devel-3 Commit: d7afe728091ff6d795dda202d0a3579d1ede88a9 Parents: dac8fa8 fb33c23 Author: Thomas Weise Authored: Sat Oct 17 23:28:21 2015 -0700 Committer: Thomas Weise Committed: Sat Oct 17 23:28:21 2015 -0700 ---------------------------------------------------------------------- .../stram/StreamingContainerManager.java | 35 +++++++++++--------- .../stram/StreamingContainerManagerTest.java | 11 ++---- 2 files changed, 22 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d7afe728/engine/src/test/java/com/datatorrent/stram/StreamingContainerManagerTest.java ----------------------------------------------------------------------