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 EEA25200BB1 for ; Thu, 3 Nov 2016 12:50:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id ED898160AFF; Thu, 3 Nov 2016 11:50:32 +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 83B20160B22 for ; Thu, 3 Nov 2016 12:50:30 +0100 (CET) Received: (qmail 90202 invoked by uid 500); 3 Nov 2016 11:50:29 -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 89641 invoked by uid 99); 3 Nov 2016 11:50: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, 03 Nov 2016 11:50:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D5E5F1727; Thu, 3 Nov 2016 11:50:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Thu, 03 Nov 2016 11:50:50 -0000 Message-Id: <97a13e871746482faf9fdc3b2819c52f@git.apache.org> In-Reply-To: <5b792d1f943d4027b8e0d56dd103a7a5@git.apache.org> References: <5b792d1f943d4027b8e0d56dd103a7a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/45] tinkerpop git commit: Merge branch 'tp32' archived-at: Thu, 03 Nov 2016 11:50:33 -0000 Merge branch 'tp32' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b75d24bb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b75d24bb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b75d24bb Branch: refs/heads/TINKERPOP-1420 Commit: b75d24bbde0ebd344529eff8986567d85fcdd1bd Parents: 4f54d2d b210840 Author: Stephen Mallette Authored: Wed Nov 2 06:56:25 2016 -0400 Committer: Stephen Mallette Committed: Wed Nov 2 06:56:25 2016 -0400 ---------------------------------------------------------------------- gremlin-python/src/main/jython/setup.py | 4 ++-- .../traversal/strategy/decoration/TranslationStrategy.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------