Merge remote-tracking branch 'origin/trunk' into perf
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/ed8b54ee Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/ed8b54ee Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/ed8b54ee Branch: refs/heads/perf Commit: ed8b54eee95c012c9ffd7bc464776b05846c6308 Parents: 370b42b a4d3330 Author: Nitay Joffe <[email protected]> Authored: Sun Mar 24 16:45:25 2013 -0400 Committer: Nitay Joffe <[email protected]> Committed: Sun Mar 24 16:45:25 2013 -0400 ---------------------------------------------------------------------- CHANGELOG | 7 ++ .../java/org/apache/giraph/comm/ServerData.java | 4 +- .../giraph/comm/aggregators/AggregatorUtils.java | 15 +-- .../comm/aggregators/AllAggregatorServerData.java | 12 ++- .../aggregators/OwnerAggregatorServerData.java | 10 ++- .../giraph/worker/WorkerAggregatorHandler.java | 3 +- .../io/hbase/TestHBaseRootMarkerVertextFormat.java | 70 +++++++++++---- .../org/apache/giraph/hive/HiveGiraphRunner.java | 6 +- 8 files changed, 90 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/ed8b54ee/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java ----------------------------------------------------------------------
