Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-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 B3853172CD for ; Wed, 9 Dec 2015 13:51:33 +0000 (UTC) Received: (qmail 22527 invoked by uid 500); 9 Dec 2015 13:51:33 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 22503 invoked by uid 500); 9 Dec 2015 13:51:33 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 22489 invoked by uid 99); 9 Dec 2015 13:51:33 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 13:51:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C1C671A4117 for ; Wed, 9 Dec 2015 13:51:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 6oK3ehciTSh9 for ; Wed, 9 Dec 2015 13:51:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 6D8AA258BA for ; Wed, 9 Dec 2015 13:51:29 +0000 (UTC) Received: (qmail 22258 invoked by uid 99); 9 Dec 2015 13:51:28 -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, 09 Dec 2015 13:51:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F00B1E0B5B; Wed, 9 Dec 2015 13:51:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.incubator.apache.org Date: Wed, 09 Dec 2015 13:51:23 -0000 Message-Id: <4f1c266ee7fd43d1b6de4785f33cc0b2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/14] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP-1023 Merge branch 'master' into TINKERPOP-1023 Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4d1d8c90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4d1d8c90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4d1d8c90 Branch: refs/heads/master Commit: 4d1d8c90cead1aac4ca61b4510ea533c39b1ad7a Parents: 9d6467c b1b4058 Author: Marko A. Rodriguez Authored: Tue Dec 8 08:29:26 2015 -0700 Committer: Marko A. Rodriguez Committed: Tue Dec 8 08:29:26 2015 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../peerpressure/PeerPressureVertexProgram.java | 5 +- .../process/GroovyProcessComputerSuite.java | 5 +- .../gremlin/process/ProcessComputerSuite.java | 4 +- .../PeerPressureVertexProgramTest.java | 63 +++++++++++++++ .../ranking/PageRankVertexProgramTest.java | 83 -------------------- .../pagerank/PageRankVertexProgramTest.java | 83 ++++++++++++++++++++ 7 files changed, 157 insertions(+), 87 deletions(-) ----------------------------------------------------------------------