giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/trunk to 0c8700d
Date Tue, 09 Jul 2013 01:46:18 GMT
Updated Branches:
  refs/heads/trunk c2af20485 -> 0c8700daf


GIRAPH-710: Define zookeeper version in a property to allow build time override (apurtell
via nitay)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/0c8700da
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/0c8700da
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/0c8700da

Branch: refs/heads/trunk
Commit: 0c8700dafb01b28b5e8727d93261da0bcc080a9f
Parents: c2af204
Author: Nitay Joffe <nitay@apache.org>
Authored: Mon Jul 8 21:35:53 2013 -0400
Committer: Nitay Joffe <nitay@apache.org>
Committed: Mon Jul 8 21:40:19 2013 -0400

----------------------------------------------------------------------
 CHANGELOG | 5 ++++-
 pom.xml   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/0c8700da/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 8bfb4dd..dea6edc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-710: Define zookeeper version in a property to allow build time
+  override (apurtell via nitay)
+
   GIRAPH-705: Type converters and giraph-hive cleanup (nitay)
 
   GIRAPH-704: Specialized message stores (majakabiljo)
@@ -14,7 +17,7 @@ Release 1.1.0 - unreleased
 
   GIRAPH-698: Expose Computation to a user (aching)
 
-  GIRAPH-311:  Master halting in superstep 0 is ignored by workers (majakabiljo)
+  GIRAPH-311: Master halting in superstep 0 is ignored by workers (majakabiljo)
 
   GIRAPH-688: Make sure Giraph builds against all compatible YARN-enabled Hadoop versions,
   warns if none set, works w/new 1.1.0 line (ereisman)

http://git-wip-us.apache.org/repos/asf/giraph/blob/0c8700da/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7a9bdaa..72fe6f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,7 @@ under the License.
     <dep.jython.version>2.5.3</dep.jython.version>
     <dep.typetools.version>0.2.1</dep.typetools.version>
 
+    <zookeeper.version>3.3.3</zookeeper.version>
     <hbase.version>0.90.5</hbase.version>
     <codehaus-jackson.version>1.8.0</codehaus-jackson.version>
     <fasterxml-jackson.version>2.1.0</fasterxml-jackson.version>
@@ -1083,7 +1084,7 @@ under the License.
       <dependency>
         <groupId>org.apache.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
-        <version>3.3.3</version>
+        <version>${zookeeper.version}</version>
         <exclusions>
           <exclusion>
             <groupId>com.sun.jmx</groupId>


Mime
View raw message