Updated Branches: refs/heads/trunk 89bba9534 -> 5d0053211
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/giraph into trunk Conflicts: CHANGELOG Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/5d005321 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/5d005321 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/5d005321 Branch: refs/heads/trunk Commit: 5d005321187e632c489d3ce56dd3b6bd1c3c8652 Parents: 2f55c9b 89bba95 Author: Claudio Martella <[email protected]> Authored: Mon Feb 18 15:01:42 2013 +0100 Committer: Claudio Martella <[email protected]> Committed: Mon Feb 18 15:01:42 2013 +0100 ---------------------------------------------------------------------- CHANGELOG | 6 + .../apache/giraph/conf/GiraphConfiguration.java | 9 + .../org/apache/giraph/conf/GiraphConstants.java | 15 ++ .../org/apache/giraph/graph/GraphTaskManager.java | 8 +- .../apache/giraph/graph/ReverseEdgeDuplicator.java | 115 ++++++++++++++ .../formats/IntNullReverseTextEdgeInputFormat.java | 47 ++++++ .../org/apache/giraph/master/BspServiceMaster.java | 6 +- .../main/java/org/apache/giraph/utils/JMap.java | 84 +++++++++++ .../org/apache/giraph/utils/JMapHistoDumper.java | 117 +++++++++++++++ .../org/apache/giraph/worker/BspServiceWorker.java | 22 ++-- .../java/org/apache/giraph/io/TestEdgeInput.java | 34 ++++- giraph-hcatalog/pom.xml | 35 ----- pom.xml | 22 ++-- 13 files changed, 458 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/5d005321/CHANGELOG ---------------------------------------------------------------------- diff --cc CHANGELOG index ff423c2,5204023..68d1261 --- a/CHANGELOG +++ b/CHANGELOG @@@ -1,8 -1,11 +1,14 @@@ Giraph Change Log Release 0.2.0 - unreleased + + GIRAPH-514: DiskBackedMessageStores should take advantage of machines with multiple disks (claudio) ++ + GIRAPH-520: ReverseEdgeDuplicator (nitay) + + GIRAPH-522: JMap Dumper (nitay) + + GIRAPH-517: Use stable hcatalog 0.5.0-incubating (nitay) GIRAPH-503: Refactor platform-independent CLI argument parsing in GiraphRunner into a separate class (ereisman)
