Repository: giraph
Updated Branches:
  refs/heads/trunk a45450cc5 -> 2aa3af8d9
Updated Tags:  refs/tags/release-1.1.0 [created] 0466bccf9


Opening up 1.2.0-SNAPSHOT development now that 1.1.0 has been released


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

Branch: refs/heads/trunk
Commit: 2aa3af8d940a793cd2339e158e5bbac4fe9637d1
Parents: a45450c
Author: Roman Shaposhnik <[email protected]>
Authored: Tue Nov 25 15:40:18 2014 -0800
Committer: Roman Shaposhnik <[email protected]>
Committed: Tue Nov 25 16:36:32 2014 -0800

----------------------------------------------------------------------
 CHANGELOG                                | 5 ++++-
 giraph-accumulo/pom.xml                  | 2 +-
 giraph-core/pom.xml                      | 2 +-
 giraph-dist/pom.xml                      | 2 +-
 giraph-examples/pom.xml                  | 4 ++--
 giraph-gora/pom.xml                      | 2 +-
 giraph-hbase/pom.xml                     | 2 +-
 giraph-hcatalog/pom.xml                  | 2 +-
 giraph-hive/pom.xml                      | 2 +-
 giraph-rexster/giraph-kibble/pom.xml     | 2 +-
 giraph-rexster/giraph-rexster-io/pom.xml | 2 +-
 giraph-rexster/pom.xml                   | 2 +-
 pom.xml                                  | 2 +-
 src/site/xdoc/index.xml                  | 2 +-
 src/site/xdoc/quick_start.xml            | 8 ++++----
 src/site/xdoc/releases.xml               | 3 +--
 src/site/xdoc/rexster.xml                | 2 +-
 17 files changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index e6b2470..cf914e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,15 @@
 Giraph Change Log
 
-Release 1.1.0 - unreleased
+Release 1.2.0 - unreleased
   GIRAPH-964: Remove quotes from output partition specification in hive-io 
(majakabiljo)
 
   GIRAPH-963: Aggregators may not be initialized properly (edunov via 
majakabiljo)
 
   GIRAPH-955: Allow vertex/edge/message value to be configurable (ikabiljo via 
majakabiljo)
 
+Release 1.1.0 - 2014-11-19
+  GIRAPH-961: Internals of MasterLoggingAggregator have been incorrectly 
removed
+
   GIRAPH-938: Allow fast working with primitives generically (ikabiljo via 
pavanka)
 
   GIRAPH-945: Always use job Configuration to create Configuration 
(majakabiljo)

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml
index 7c2016f..9f4bfb2 100644
--- a/giraph-accumulo/pom.xml
+++ b/giraph-accumulo/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-accumulo</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index 23f6666..ff129d0 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-core</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-dist/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-dist/pom.xml b/giraph-dist/pom.xml
index bac8a24..70891ce 100644
--- a/giraph-dist/pom.xml
+++ b/giraph-dist/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>giraph-dist</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-examples/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-examples/pom.xml b/giraph-examples/pom.xml
index f95edcb..414c8c9 100644
--- a/giraph-examples/pom.xml
+++ b/giraph-examples/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-examples</artifactId>
   <packaging>jar</packaging>
@@ -429,7 +429,7 @@ under the License.
     <dependency>
       <groupId>org.apache.giraph</groupId>
       <artifactId>giraph-core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-gora/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gora/pom.xml b/giraph-gora/pom.xml
index 7f499c6..b6c1047 100644
--- a/giraph-gora/pom.xml
+++ b/giraph-gora/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.giraph</groupId>
         <artifactId>giraph-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>giraph-gora</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml
index d6bdc92..1334e82 100644
--- a/giraph-hbase/pom.xml
+++ b/giraph-hbase/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-hbase</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml
index af084ac..68acdf9 100644
--- a/giraph-hcatalog/pom.xml
+++ b/giraph-hcatalog/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-hcatalog</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-hive/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hive/pom.xml b/giraph-hive/pom.xml
index dbe93e2..1772f63 100644
--- a/giraph-hive/pom.xml
+++ b/giraph-hive/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-hive</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-rexster/giraph-kibble/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/giraph-kibble/pom.xml 
b/giraph-rexster/giraph-kibble/pom.xml
index 710d50c..dca47b0 100644
--- a/giraph-rexster/giraph-kibble/pom.xml
+++ b/giraph-rexster/giraph-kibble/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-rexster</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>giraph-kibble</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-rexster/giraph-rexster-io/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/giraph-rexster-io/pom.xml 
b/giraph-rexster/giraph-rexster-io/pom.xml
index 6bbb236..beba69c 100644
--- a/giraph-rexster/giraph-rexster-io/pom.xml
+++ b/giraph-rexster/giraph-rexster-io/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-rexster</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>giraph-rexster-io</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/giraph-rexster/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/pom.xml b/giraph-rexster/pom.xml
index 260d3de..5e90d6c 100644
--- a/giraph-rexster/pom.xml
+++ b/giraph-rexster/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>giraph-rexster</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe7db61..cf0e1f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ under the License.
   <groupId>org.apache.giraph</groupId>
   <artifactId>giraph-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
 
   <name>Apache Giraph Parent</name>
   <url>http://giraph.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 4ece29d..0144d43 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -37,7 +37,7 @@ under the License.
 
       <subsection name="News">
         <ul>
-          <li><strong><b>???</b>, 2014: Giraph 1.1.0 is comming ... </strong> 
Please pick up a copy <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.1.0";>here</a>.</li>
+          <li><strong>Nov 19, 2014: Giraph 1.1.0 is now released!</strong> 
Please pick up a copy <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.1.0";>here</a>.</li>
           <li><strong>May 6, 2013: Giraph 1.0.0 is now released!</strong> 
Please pick up a copy <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0";>here</a>.</li>
           <li><strong>February 6, 2012: Giraph 0.1-incubating 
released.</strong> The Giraph PPMC is excited to announce that version 0.1 has 
been released. Grab a copy of the archived release <a 
href="http://archive.apache.org/dist/incubator/giraph";>here</a>.</li>
         </ul>

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/src/site/xdoc/quick_start.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/quick_start.xml b/src/site/xdoc/quick_start.xml
index cdef668..93aace3 100644
--- a/src/site/xdoc/quick_start.xml
+++ b/src/site/xdoc/quick_start.xml
@@ -52,7 +52,7 @@ under the License.
           <li>Network mask: <tt>255.255.255.0</tt></li>
         </ul>
         <li>Apache Hadoop 0.20.203.0-RC1</li>
-        <li>Apache Giraph 1.1.0-SNAPSHOT</li>
+        <li>Apache Giraph 1.2.0-SNAPSHOT</li>
       </ul>
     </section>
     <section name="Deploying Hadoop" id="qs_section_2">
@@ -195,7 +195,7 @@ su - hduser</source>
 source $HOME/.bashrc
 cd $GIRAPH_HOME
 mvn package -DskipTests</source>
-    <p>The argument <tt>-DskipTests</tt> will skip the testing phase. This may 
take a while on the first run because Maven is downloading the most recent 
artifacts (plugin JARs and other files) into your local repository. You may 
also need to execute the command a couple of times before it succeeds. This is 
because the remote server may time out before your downloads are complete. Once 
the packaging is successful, you will have the Giraph core JAR 
<tt>$GIRAPH_HOME/giraph-core/target/giraph-1.1.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar</tt>
 and Giraph examples JAR 
<tt>$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.1.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar</tt>.
 You are done with deploying Giraph.</p>
+    <p>The argument <tt>-DskipTests</tt> will skip the testing phase. This may 
take a while on the first run because Maven is downloading the most recent 
artifacts (plugin JARs and other files) into your local repository. You may 
also need to execute the command a couple of times before it succeeds. This is 
because the remote server may time out before your downloads are complete. Once 
the packaging is successful, you will have the Giraph core JAR 
<tt>$GIRAPH_HOME/giraph-core/target/giraph-1.2.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar</tt>
 and Giraph examples JAR 
<tt>$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.1.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar</tt>.
 You are done with deploying Giraph.</p>
     </section>
   
     <section name="Running a Giraph job" id="qs_section_6">
@@ -212,9 +212,9 @@ $HADOOP_HOME/bin/hadoop dfs -copyFromLocal 
/tmp/tiny_graph.txt /user/hduser/inpu
 $HADOOP_HOME/bin/hadoop dfs -ls /user/hduser/input</source>
       <p>We will use <tt>IdWithValueTextOutputFormat</tt> output file format, 
where each line consists of <tt>source_id length</tt> for each node in the 
input graph (the source node has a length of 0, by convention). You can now run 
the example by:</p>
       <source>
-$HADOOP_HOME/bin/hadoop jar 
$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.1.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar
 org.apache.giraph.GiraphRunner 
org.apache.giraph.examples.SimpleShortestPathsComputation -vif 
org.apache.giraph.io.formats.JsonLongDoubleFloatDoubleVertexInputFormat -vip 
/user/hduser/input/tiny_graph.txt -vof 
org.apache.giraph.io.formats.IdWithValueTextOutputFormat -op 
/user/hduser/output/shortestpaths -w 1</source>
+$HADOOP_HOME/bin/hadoop jar 
$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.2.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar
 org.apache.giraph.GiraphRunner 
org.apache.giraph.examples.SimpleShortestPathsComputation -vif 
org.apache.giraph.io.formats.JsonLongDoubleFloatDoubleVertexInputFormat -vip 
/user/hduser/input/tiny_graph.txt -vof 
org.apache.giraph.io.formats.IdWithValueTextOutputFormat -op 
/user/hduser/output/shortestpaths -w 1</source>
       <p>Notice that the job is computed using a single worker using the 
argument <tt>-w</tt>. To get more information about running a Giraph job, run 
the following command:</p>
-      <source>$HADOOP_HOME/bin/hadoop jar 
$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.1.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar
 org.apache.giraph.GiraphRunner -h</source>
+      <source>$HADOOP_HOME/bin/hadoop jar 
$GIRAPH_HOME/giraph-examples/target/giraph-examples-1.2.0-SNAPSHOT-for-hadoop-0.20.203.0-jar-with-dependencies.jar
 org.apache.giraph.GiraphRunner -h</source>
       <p>This will output the following:</p>
       <source>
 usage: org.apache.giraph.utils.ConfigurationUtils [-aw &lt;arg&gt;] [-c 
&lt;arg&gt;]

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/src/site/xdoc/releases.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/releases.xml b/src/site/xdoc/releases.xml
index 0e6d702..e8cf3cb 100644
--- a/src/site/xdoc/releases.xml
+++ b/src/site/xdoc/releases.xml
@@ -33,8 +33,7 @@ under the License.
 <p>
 Here are our stable releases of Giraph.</p>
 <ul>
-  <li><strong>1.1.0</strong> is comming soon !</li>
-  <!-- - Download <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0";>here</a>.</li> 
-->
+  <li><strong>1.1.0</strong> - Download <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.1.0";>here</a>.</li>
   <li><strong>1.0.0</strong> - Download <a 
href="http://www.apache.org/dyn/closer.cgi/giraph/giraph-1.0.0";>here</a>.</li>
 </ul>
 

http://git-wip-us.apache.org/repos/asf/giraph/blob/2aa3af8d/src/site/xdoc/rexster.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/rexster.xml b/src/site/xdoc/rexster.xml
index cc55eab..a8a95f8 100644
--- a/src/site/xdoc/rexster.xml
+++ b/src/site/xdoc/rexster.xml
@@ -61,7 +61,7 @@
 # Configuration
 export REXSTER_VERSION=2.4.0
 export HADOOP_VERSION=1.0.2
-export GIRAPH_VERSION=1.1.0-SNAPSHOT
+export GIRAPH_VERSION=1.2.0-SNAPSHOT
 export GIRAPH_DIR=/path/to/giraph
 export REXSTER_DIR=/path/to/rexster
 export HADOOP_DIR=/path/to/hadoop

Reply via email to