Return-Path: X-Original-To: apmail-giraph-commits-archive@www.apache.org Delivered-To: apmail-giraph-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1617010504 for ; Thu, 10 Oct 2013 19:52:43 +0000 (UTC) Received: (qmail 85913 invoked by uid 500); 10 Oct 2013 19:52:42 -0000 Delivered-To: apmail-giraph-commits-archive@giraph.apache.org Received: (qmail 85834 invoked by uid 500); 10 Oct 2013 19:52:41 -0000 Mailing-List: contact commits-help@giraph.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@giraph.apache.org Delivered-To: mailing list commits@giraph.apache.org Received: (qmail 85827 invoked by uid 99); 10 Oct 2013 19:52:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Oct 2013 19:52:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 59629914891; Thu, 10 Oct 2013 19:52:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maja@apache.org To: commits@giraph.apache.org Message-Id: <77cf68a5755c48e992b840ebfbef8d79@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/trunk to d644af8 Date: Thu, 10 Oct 2013 19:52:40 +0000 (UTC) Updated Branches: refs/heads/trunk 2c89b9702 -> d644af866 GIRAPH-777: Fix bug from GIRAPH-775 (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/d644af86 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/d644af86 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/d644af86 Branch: refs/heads/trunk Commit: d644af86642b5efbf889731139a880d68eedd153 Parents: 2c89b97 Author: Maja Kabiljo Authored: Thu Oct 10 12:51:38 2013 -0700 Committer: Maja Kabiljo Committed: Thu Oct 10 12:52:23 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../apache/giraph/comm/requests/SendWorkerVerticesRequest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/d644af86/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index ec91f33..18d956c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-777: Fix bug from GIRAPH-775 (majakabiljo) + GIRAPH-776: Update Giraph to use HiveIO 0.18 (gmalewicz via majakabiljo) GIRAPH-775: Vertex value combiner (aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/d644af86/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java b/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java index 386e0ee..69fae83 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java @@ -115,7 +115,8 @@ public class SendWorkerVerticesRequest.Iterator iterator = workerPartitions.getIterator(); while (iterator.hasNext()) {