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 B060918C81 for ; Thu, 22 Oct 2015 05:07:45 +0000 (UTC) Received: (qmail 25224 invoked by uid 500); 22 Oct 2015 05:07:45 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 25183 invoked by uid 500); 22 Oct 2015 05:07:45 -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 25174 invoked by uid 99); 22 Oct 2015 05:07:45 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 05:07:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 21353C04B9 for ; Thu, 22 Oct 2015 05:07:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id G6KNtlxvWtoZ for ; Thu, 22 Oct 2015 05:07:32 +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 9C96E2770F for ; Thu, 22 Oct 2015 05:07:30 +0000 (UTC) Received: (qmail 25051 invoked by uid 99); 22 Oct 2015 05:07:29 -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, 22 Oct 2015 05:07:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BF76DE0985; Thu, 22 Oct 2015 05:07:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ilganeli@apache.org To: commits@apex.incubator.apache.org Date: Thu, 22 Oct 2015 05:07:31 -0000 Message-Id: <23dfd73c344a47bf967409f60890d608@git.apache.org> In-Reply-To: <7551e2c0c3cd44eb8924d05e54938fb7@git.apache.org> References: <7551e2c0c3cd44eb8924d05e54938fb7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-apex-core git commit: Merge branch 'devel-3' of https://git-wip-us.apache.org/repos/asf/incubator-apex-core into devel-3 Merge branch 'devel-3' of https://git-wip-us.apache.org/repos/asf/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/2e8ffc6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2e8ffc6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2e8ffc6b Branch: refs/heads/devel-3 Commit: 2e8ffc6be9905dc2165965445a2122caa9b49776 Parents: eb0a95f 83f95d8 Author: Ilya Ganelin Authored: Wed Oct 21 22:07:47 2015 -0700 Committer: Ilya Ganelin Committed: Wed Oct 21 22:07:47 2015 -0700 ---------------------------------------------------------------------- .../com/datatorrent/stram/StreamingContainerManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------