Updated Branches: refs/heads/trunk 52a6d3e6a -> 357c18658
GIRAPH-757 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/357c1865 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/357c1865 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/357c1865 Branch: refs/heads/trunk Commit: 357c186584ddce07853db125c5de09ccc144e5d3 Parents: 52a6d3e Author: Claudio Martella <[email protected]> Authored: Mon Nov 18 15:27:21 2013 +0100 Committer: Claudio Martella <[email protected]> Committed: Mon Nov 18 15:27:21 2013 +0100 ---------------------------------------------------------------------- CHANGELOG | 2 ++ pom.xml | 7 +++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/357c1865/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 2a1d399..c17322e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-757: Create VertexInputFormat from Apache Gora (renato2099 via claudio) + GIRAPH-442: FileNotFoundException: <baseDirectory>/_zkServer is checked before it is created (miteshsjat via claudio) http://git-wip-us.apache.org/repos/asf/giraph/blob/357c1865/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c681696..4660f0a 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,7 @@ under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dep.accumulo.version>1.4.0</dep.accumulo.version> + <dep.gora.version>0.3</dep.gora.version> <dep.airline.version>0.5</dep.airline.version> <dep.base64.version>2.3.8</dep.base64.version> <dep.cli-parser.version>1.1</dep.cli-parser.version> @@ -618,6 +619,7 @@ under the License. <module>giraph-hbase</module> <module>giraph-hcatalog</module> <module>giraph-hive</module> + <module>giraph-gora</module> <module>giraph-rexster</module> </modules> <activation> @@ -1085,6 +1087,11 @@ under the License. <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.gora</groupId> + <artifactId>gora-core</artifactId> + <version>${dep.gora.version}</version> + </dependency> + <dependency> <groupId>org.apache.hcatalog</groupId> <artifactId>hcatalog-core</artifactId> <version>${dep.hcatalog.version}</version>
