From commits-return-27684-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Tue Apr 3 16:53:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 53DCF1807BA for ; Tue, 3 Apr 2018 16:53:15 +0200 (CEST) Received: (qmail 39708 invoked by uid 500); 3 Apr 2018 14:53:14 -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 39615 invoked by uid 99); 3 Apr 2018 14:53:14 -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, 03 Apr 2018 14:53:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BFFB6F6AF8; Tue, 3 Apr 2018 14:53:13 +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: Tue, 03 Apr 2018 14:53:27 -0000 Message-Id: <6b7e366f50ec473ba451cab3a484e190@git.apache.org> In-Reply-To: <6cd641cee33347cfa79c3198dac8956e@git.apache.org> References: <6cd641cee33347cfa79c3198dac8956e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1865' into tp33 Merge remote-tracking branch 'origin/TINKERPOP-1865' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffabea86 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffabea86 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffabea86 Branch: refs/heads/TINKERPOP-1878 Commit: ffabea8656a435fd073e418b565885753bf820a3 Parents: eb35177 4c64bc0 Author: Stephen Mallette Authored: Thu Mar 22 15:06:02 2018 -0400 Committer: Stephen Mallette Committed: Thu Mar 22 15:06:02 2018 -0400 ---------------------------------------------------------------------- .../Gherkin/CommonSteps.cs | 5 ++-- .../Gherkin/GherkinTestRunner.cs | 4 +++- .../Gherkin/IgnoreException.cs | 4 ++++ .../Gherkin/ScenarioData.cs | 24 +++++--------------- .../RemoteConnectionFactory.cs | 6 ++--- gremlin-test/features/map/Order.feature | 2 +- 6 files changed, 19 insertions(+), 26 deletions(-) ----------------------------------------------------------------------