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 D5144200B5A for ; Thu, 30 Jun 2016 01:28:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D2288160A57; Wed, 29 Jun 2016 23:28:01 +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 4A3B0160A6E for ; Thu, 30 Jun 2016 01:28:01 +0200 (CEST) Received: (qmail 3895 invoked by uid 500); 29 Jun 2016 23:28:00 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 3875 invoked by uid 99); 29 Jun 2016 23:28:00 -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; Wed, 29 Jun 2016 23:28:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 46DF8E964D; Wed, 29 Jun 2016 23:28:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.apache.org Date: Wed, 29 Jun 2016 23:28:04 -0000 Message-Id: <6cc82b1bb9f44aca8aa1dca4a5df629a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] tinkerpop git commit: Merge branch 'master' into TINKERPOP-1278 archived-at: Wed, 29 Jun 2016 23:28:02 -0000 Merge branch 'master' into TINKERPOP-1278 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9f032fc7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9f032fc7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9f032fc7 Branch: refs/heads/TINKERPOP-1278 Commit: 9f032fc7e8e521bf23ea4622f2effdb108ab47e4 Parents: cc7ce89 5395aae Author: Marko A. Rodriguez Authored: Wed Jun 29 17:27:48 2016 -0600 Committer: Marko A. Rodriguez Committed: Wed Jun 29 17:27:48 2016 -0600 ---------------------------------------------------------------------- docs/preprocessor/preprocess-file.sh | 7 +++++++ .../gremlin/process/traversal/TraversalInterruptionTest.java | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9f032fc7/docs/preprocessor/preprocess-file.sh ----------------------------------------------------------------------