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 DEF5E18FDC for ; Fri, 1 Apr 2016 03:54:48 +0000 (UTC) Received: (qmail 24043 invoked by uid 500); 1 Apr 2016 03:54:48 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 24007 invoked by uid 500); 1 Apr 2016 03:54:48 -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 23998 invoked by uid 99); 1 Apr 2016 03:54:48 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Apr 2016 03:54:48 +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 6D5E11804D3 for ; Fri, 1 Apr 2016 03:54:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id BEBuJ8tVvcta for ; Fri, 1 Apr 2016 03:54:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id F10455FB01 for ; Fri, 1 Apr 2016 03:54:42 +0000 (UTC) Received: (qmail 23602 invoked by uid 99); 1 Apr 2016 03:54:42 -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; Fri, 01 Apr 2016 03:54:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DFBF0E97AF; Fri, 1 Apr 2016 03:54:41 +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: Fri, 01 Apr 2016 03:54:52 -0000 Message-Id: <0a7e89607f284448b052c06f0bf15361@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/12] incubator-apex-malhar git commit: Merge branch 'APEXMALHAR-2036' Merge branch 'APEXMALHAR-2036' Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/a23cc5b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/a23cc5b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/a23cc5b8 Branch: refs/heads/devel-3 Commit: a23cc5b8f3dd2be743e125ea2998f4d351983f3d Parents: c3f6951 4d0fc75 Author: Timothy Farkas Authored: Tue Mar 29 19:02:44 2016 -0700 Committer: Timothy Farkas Committed: Tue Mar 29 19:02:44 2016 -0700 ---------------------------------------------------------------------- ...actFileInputOperatorFailureHandlingTest.java | 2 ++ .../io/fs/AbstractFileInputOperatorTest.java | 8 ++------ .../io/fs/AbstractFileOutputOperatorTest.java | 4 +++- .../AbstractWindowFileOutputOperatorTest.java | 1 + .../lib/io/fs/FileSplitterBaseTest.java | 21 +++++++++++++------- .../lib/io/fs/FileSplitterInputTest.java | 4 ++-- .../state/managed/BucketsFileSystemTest.java | 5 +++-- .../lib/state/managed/DefaultBucketTest.java | 5 +++-- .../IncrementalCheckpointManagerTest.java | 5 +++-- .../lib/state/managed/ManagedStateImplTest.java | 5 +++-- .../state/managed/ManagedStateTestUtils.java | 13 ------------ .../state/managed/ManagedTimeStateImplTest.java | 5 +++-- .../ManagedTimeUnifiedStateImplTest.java | 5 +++-- .../lib/state/managed/StateTrackerTest.java | 5 +++-- 14 files changed, 45 insertions(+), 43 deletions(-) ----------------------------------------------------------------------