Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/giraph into trunk
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/ff02c5d6 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/ff02c5d6 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/ff02c5d6 Branch: refs/heads/trunk Commit: ff02c5d6cf98c86f2aff5cf21206b1bdfabab4f9 Parents: b053658 04bf3d6 Author: Claudio Martella <[email protected]> Authored: Wed May 8 00:51:51 2013 +0200 Committer: Claudio Martella <[email protected]> Committed: Wed May 8 00:51:51 2013 +0200 ---------------------------------------------------------------------- CHANGELOG | 4 ++++ .../io/internal/WrappedVertexOutputFormat.java | 8 ++++---- .../giraph/hive/common/HiveInputOptions.java | 2 +- pom.xml | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
