Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EBC99200C3E for ; Tue, 21 Mar 2017 07:27:18 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EA642160B90; Tue, 21 Mar 2017 06:27:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62A57160B68 for ; Tue, 21 Mar 2017 07:27:18 +0100 (CET) Received: (qmail 67271 invoked by uid 500); 21 Mar 2017 06:27:17 -0000 Mailing-List: contact commits-help@apex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.apache.org Delivered-To: mailing list commits@apex.apache.org Received: (qmail 67256 invoked by uid 99); 21 Mar 2017 06:27:17 -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; Tue, 21 Mar 2017 06:27:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F30EDFFC0; Tue, 21 Mar 2017 06:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pramod@apache.org To: commits@apex.apache.org Date: Tue, 21 Mar 2017 06:27:17 -0000 Message-Id: <32593b76e3e042de92537544e728dfaf@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] apex-core git commit: Merge branch 'APEXCORE-504' of github.com:vrozov/apex-core archived-at: Tue, 21 Mar 2017 06:27:19 -0000 Merge branch 'APEXCORE-504' of github.com:vrozov/apex-core Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/d90e8829 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/d90e8829 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/d90e8829 Branch: refs/heads/master Commit: d90e8829fd89edba66ee5b79296a69fd9a5b6dd8 Parents: 491e2e3 283ebe2 Author: Pramod Immaneni Authored: Mon Mar 20 23:25:06 2017 -0700 Committer: Pramod Immaneni Committed: Mon Mar 20 23:25:06 2017 -0700 ---------------------------------------------------------------------- .../stram/StreamingContainerAgent.java | 53 +++++++++----------- .../stram/StreamingContainerManager.java | 4 +- .../stram/plan/logical/LogicalPlan.java | 39 +++++++++----- .../stram/plan/physical/PhysicalPlan.java | 16 +++--- .../stram/plan/physical/StreamMapping.java | 13 ++--- .../com/datatorrent/stram/StreamCodecTest.java | 8 +-- .../stram/plan/StreamPersistanceTests.java | 2 +- 7 files changed, 69 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/d90e8829/engine/src/main/java/com/datatorrent/stram/StreamingContainerManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/d90e8829/engine/src/main/java/com/datatorrent/stram/plan/logical/LogicalPlan.java ----------------------------------------------------------------------