flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject git commit: Link release 0.6-incubating in 0.6.1-incubating branch
Date Mon, 25 Aug 2014 12:25:22 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/release-0.6.1 0d176222d -> 2ae23d9fa


Link release 0.6-incubating in 0.6.1-incubating branch


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

Branch: refs/heads/release-0.6.1
Commit: 2ae23d9fa5a9ba71014b9e948aa7d7d1cad0a369
Parents: 0d17622
Author: Robert Metzger <rmetzger@apache.org>
Authored: Mon Aug 25 14:24:49 2014 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Mon Aug 25 14:24:49 2014 +0200

----------------------------------------------------------------------
 docs/_config.yml               | 10 +++---
 docs/run_example_quickstart.md | 64 +++++++++++++------------------------
 docs/yarn_setup.md             |  2 +-
 3 files changed, 30 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/2ae23d9f/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index fbb44a6..31b3083 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -5,13 +5,15 @@
 #     {{ site.CONFIG_KEY }}
 #------------------------------------------------------------------------------
 
-FLINK_VERSION_STABLE: 0.6-incubating-SNAPSHOT # this variable can point to a SNAPSHOT version
in the git source.
-FLINK_VERSION_HADOOP_2_STABLE: 0.6-hadoop2-incubating-SNAPSHOT
+FLINK_VERSION_STABLE: 0.6-incubating # this variable can point to a SNAPSHOT version in the
git source.
+FLINK_VERSION_HADOOP_2_STABLE: 0.6-hadoop2-incubating
 FLINK_VERSION_SHORT: 0.6
 FLINK_ISSUES_URL: https://issues.apache.org/jira/browse/FLINK
 FLINK_GITHUB_URL:  https://github.com/apache/incubator-flink
 
-FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
+FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop1.tgz
+FLINK_DOWNLOAD_URL_HADOOP_2_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2.tgz
+FLINK_DOWNLOAD_URL_YARN_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2-yarn.tgz
 
 #------------------------------------------------------------------------------
 # BUILD CONFIG
@@ -33,4 +35,4 @@ redcarpet:
   # https://help.github.com/articles/github-flavored-markdown
   extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink",
                "tables", "with_toc_data", "strikethrough", "superscript",
-               "lax_spacing"]
+               "lax_spacing"]
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/2ae23d9f/docs/run_example_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/run_example_quickstart.md b/docs/run_example_quickstart.md
index 0cdac49..c54fed4 100644
--- a/docs/run_example_quickstart.md
+++ b/docs/run_example_quickstart.md
@@ -2,15 +2,6 @@
 title: "Quick Start: Run K-Means Example"
 ---
 
-<div class="panel panel-warning">
-  <div class="panel-heading">
-    Note
-  </div>
-  <div class="panel-body">
-  	This page is using both names "Flink" and "Stratosphere" to refer to the system. We recently
changed the name to Apache Flink, but there is no stable release available for it yet, therefore
the example here refers to the latest stable Stratosphere release (0.5.2).
-  </div>
-</div>
-
 
 This guide will demonstrate Flink's features by example. You will see how you can leverage
Flink's Iteration-feature to find clusters in a dataset using [K-Means clustering](http://en.wikipedia.org/wiki/K-means_clustering).

 On the way, you will see the compiler, the status interface and the result of the algorithm.
@@ -18,30 +9,20 @@ On the way, you will see the compiler, the status interface and the result
of th
 
 #  Generate Input Data
 Flink contains a data generator for K-Means.
-<!--
-	REACTIVATE WHEN WE HAVE A FIRST APACHE FLINK RELEASE
-
-	# Download Flink
-	wget {{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}
-	tar xzf flink-*.tgz 
-	cd flink-*
-	mkdir kmeans
-	cd kmeans
-	# Run data generator
-	java -cp  ../examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-KMeans.jar org.apache.flink.example.java.clustering.util.KMeansDataGenerator
500 10 0.08
-	cp /tmp/points .
-	cp /tmp/centers .
--->
-	# Download Flink (still called Stratosphere in the 0.5.2 release)
-	wget https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
-	tar xzf stratosphere-*.tgz 
-	cd stratosphere
-	mkdir kmeans
-	cd kmeans
-	# Run data generator
-	java -cp  ../examples/stratosphere-java-examples-0.5.2-KMeans.jar eu.stratosphere.example.java.clustering.util.KMeansDataGenerator
500 10 0.08
-	cp /tmp/points .
-	cp /tmp/centers .
+
+```bash
+# pick a mirror from: {{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}
+# for example
+wget http://mirror.lwnetwork.org.uk/APACHE/incubator/flink/flink-0.6-incubating-bin-hadoop1.tgz
+tar xzf flink-*.tgz 
+cd flink-*
+mkdir kmeans
+cd kmeans
+# Run data generator
+java -cp  ../examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-KMeans.jar org.apache.flink.example.java.clustering.util.KMeansDataGenerator
500 10 0.08
+cp /tmp/points .
+cp /tmp/centers .
+```
 
 The generator has the following arguments:
 
@@ -72,13 +53,14 @@ The following overview presents the impact of the different standard deviations
 
 # Run Clustering
 We are using the generated input data to run the clustering using a Flink job.
-
-	# go to the Flink-root directory
-	cd stratosphere
-	# start Stratosphere/Flink (use ./bin/start-cluster.sh if you're on a cluster)
-	./bin/start-local.sh
-	# Start Stratosphere/Flink web client
-	./bin/start-webclient.sh
+```bash
+# go to the Flink-root directory
+cd flink
+# start Flink (use ./bin/start-cluster.sh if you're on a cluster)
+./bin/start-local.sh
+# Start Flink web client
+./bin/start-webclient.sh
+```
 
 # Review Flink Compiler
 The Flink webclient allows to submit Flink programs using a graphical user interface.
@@ -91,7 +73,7 @@ The Flink webclient allows to submit Flink programs using a graphical user
inter
 		1. <a href="http://localhost:8080/launch.html">Open webclient on localhost:8080</a>
<br>
 		2. Upload the file. 
 			{% highlight bash %}
-			examples/stratosphere-java-examples-0.5-SNAPSHOT-KMeans.jar
+			examples/flink-java-examples-{{site.FLINK_VERSION_STABLE}}-KMeans.jar
 			{% endhighlight %} </br>
 		3. Select it in the left box to see how the operators in the plan are connected to each
other. <br>
 		4. Enter the arguments in the lower left box:

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/2ae23d9f/docs/yarn_setup.md
----------------------------------------------------------------------
diff --git a/docs/yarn_setup.md b/docs/yarn_setup.md
index dc76826..2ab2af0 100644
--- a/docs/yarn_setup.md
+++ b/docs/yarn_setup.md
@@ -8,7 +8,7 @@ Start YARN session with 4 Taskmanagers (each with 4 GB of Heapspace):
 
 ```bash
 wget {{ site.FLINK_DOWNLOAD_URL_YARN_STABLE }}
-tar xvzf flink-dist-{{ site.FLINK_VERSION_STABLE }}-yarn.tar.gz
+tar xvzf flink-{{ site.FLINK_VERSION_STABLE }}-bin-hadoop2-yarn.tgz
 cd flink-yarn-{{ site.FLINK_VERSION_STABLE }}/
 ./bin/yarn-session.sh -n 4 -jm 1024 -tm 4096
 ```


Mime
View raw message