Merge remote-tracking branch 'gh/hive-io-bump' into hive-io-bump
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/fa337866
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/fa337866
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/fa337866
Branch: refs/heads/hive-io-bump
Commit: fa337866c725881f3b29fdcf5f989863e5e3616b
Parents: 1063a55 68b6e6d
Author: Nitay Joffe <[email protected]>
Authored: Sat Apr 6 02:14:35 2013 +0300
Committer: Nitay Joffe <[email protected]>
Committed: Sat Apr 6 02:14:35 2013 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
