You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/10/29 14:12:06 UTC

[1/2] flink-web git commit: [hotfix] [contributing-code] Add org.apache.flink.shaded.* to import order section

Repository: flink-web
Updated Branches:
  refs/heads/asf-site 3a25b3ccc -> ba1081a85


[hotfix] [contributing-code] Add org.apache.flink.shaded.* to import order section

This closes #89.


Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/8d40c838
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/8d40c838
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/8d40c838

Branch: refs/heads/asf-site
Commit: 8d40c8383434e47b40b36b9bbd7c454e5834a6fb
Parents: 3a25b3c
Author: gyao <ga...@data-artisans.com>
Authored: Fri Oct 27 15:39:17 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Sun Oct 29 15:11:37 2017 +0100

----------------------------------------------------------------------
 content/contribute-code.html | 1 +
 contribute-code.md           | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink-web/blob/8d40c838/content/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/contribute-code.html b/content/contribute-code.html
index 7421ebd..584440d 100644
--- a/content/contribute-code.html
+++ b/content/contribute-code.html
@@ -332,6 +332,7 @@
   <li><strong>Import order.</strong> Imports must be ordered alphabetically, grouped into the following blocks, with each block separated by an empty line:
     <ul>
       <li>&lt;imports from org.apache.flink.*&gt;</li>
+      <li>&lt;imports from org.apache.flink.shaded.*&gt;</li>
       <li>&lt;imports from other libraries&gt;</li>
       <li>&lt;imports from javax.*&gt;</li>
       <li>&lt;imports from java.*&gt;</li>

http://git-wip-us.apache.org/repos/asf/flink-web/blob/8d40c838/contribute-code.md
----------------------------------------------------------------------
diff --git a/contribute-code.md b/contribute-code.md
index bef6c1d..ecac1c2 100755
--- a/contribute-code.md
+++ b/contribute-code.md
@@ -147,6 +147,7 @@ It is also possible to attach a patch to a [JIRA]({{site.FLINK_ISSUES_URL}}) iss
 - **No wildcard imports.** They can cause problems when adding to the code and in some cases even during refactoring.
 - **Import order.** Imports must be ordered alphabetically, grouped into the following blocks, with each block separated by an empty line:
 	- &lt;imports from org.apache.flink.*&gt;
+	- &lt;imports from org.apache.flink.shaded.*&gt;
 	- &lt;imports from other libraries&gt;
 	- &lt;imports from javax.*&gt;
 	- &lt;imports from java.*&gt;


[2/2] flink-web git commit: [hotfix] [faq] Remove faulty line break in heading

Posted by tr...@apache.org.
[hotfix] [faq] Remove faulty line break in heading

This closes #92.


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

Branch: refs/heads/asf-site
Commit: ba1081a855dceb32a32a8ab552221b65f6d27ecf
Parents: 8d40c83
Author: gyao <ga...@data-artisans.com>
Authored: Fri Oct 27 15:55:26 2017 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Sun Oct 29 15:11:45 2017 +0100

----------------------------------------------------------------------
 content/faq.html | 5 ++---
 faq.md           | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink-web/blob/ba1081a8/content/faq.html
----------------------------------------------------------------------
diff --git a/content/faq.html b/content/faq.html
index 1672fb2..70c9be1 100644
--- a/content/faq.html
+++ b/content/faq.html
@@ -179,7 +179,7 @@ under the License.
       <li><a href="#my-job-fails-early-with-a-javaioeofexception-what-could-be-the-cause" id="markdown-toc-my-job-fails-early-with-a-javaioeofexception-what-could-be-the-cause">My job fails early with a java.io.EOFException. What could be the cause?</a></li>
       <li><a href="#my-job-fails-with-various-exceptions-from-the-hdfshadoop-code-what-can-i-do" id="markdown-toc-my-job-fails-with-various-exceptions-from-the-hdfshadoop-code-what-can-i-do">My job fails with various exceptions from the HDFS/Hadoop code. What can I do?</a></li>
       <li><a href="#in-eclipse-i-get-compilation-errors-in-the-scala-projects" id="markdown-toc-in-eclipse-i-get-compilation-errors-in-the-scala-projects">In Eclipse, I get compilation errors in the Scala projects</a></li>
-      <li><a href="#my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types" id="markdown-toc-my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types">My program does not compute the correct result. Why are my custom key types</a></li>
+      <li><a href="#my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types-not-groupedjoined-correctly" id="markdown-toc-my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types-not-groupedjoined-correctly">My program does not compute the correct result. Why are my custom key types not grouped/joined correctly?</a></li>
       <li><a href="#i-get-a-javalanginstantiationexception-for-my-data-type-what-is-wrong" id="markdown-toc-i-get-a-javalanginstantiationexception-for-my-data-type-what-is-wrong">I get a java.lang.InstantiationException for my data type, what is wrong?</a></li>
       <li><a href="#i-cant-stop-flink-with-the-provided-stop-scripts-what-can-i-do" id="markdown-toc-i-cant-stop-flink-with-the-provided-stop-scripts-what-can-i-do">I can’t stop Flink with the provided stop-scripts. What can I do?</a></li>
       <li><a href="#i-got-an-outofmemoryexception-what-can-i-do" id="markdown-toc-i-got-an-outofmemoryexception-what-can-i-do">I got an OutOfMemoryException. What can I do?</a></li>
@@ -399,8 +399,7 @@ need to manually configure the <em>flink-scala</em> project to use a <em>compile
   <li>NOTE: You have to build Flink with Maven on the command line first, to make sure the plugin is downloaded.</li>
 </ul>
 
-<h3 id="my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types">My program does not compute the correct result. Why are my custom key types</h3>
-<p>are not grouped/joined correctly?</p>
+<h3 id="my-program-does-not-compute-the-correct-result-why-are-my-custom-key-types-not-groupedjoined-correctly">My program does not compute the correct result. Why are my custom key types not grouped/joined correctly?</h3>
 
 <p>Keys must correctly implement the methods <code>java.lang.Object#hashCode()</code>,
 <code>java.lang.Object#equals(Object o)</code>, and <code>java.util.Comparable#compareTo(...)</code>.

http://git-wip-us.apache.org/repos/asf/flink-web/blob/ba1081a8/faq.md
----------------------------------------------------------------------
diff --git a/faq.md b/faq.md
index 0d61be7..7aeba85 100755
--- a/faq.md
+++ b/faq.md
@@ -216,8 +216,7 @@ need to manually configure the *flink-scala* project to use a *compiler plugin*:
 - In the field "Xplugin", put the path "/home/<user-name>/.m2/repository/org/scalamacros/paradise_2.10.4/2.0.1/paradise_2.10.4-2.0.1.jar"
 - NOTE: You have to build Flink with Maven on the command line first, to make sure the plugin is downloaded.
 
-### My program does not compute the correct result. Why are my custom key types
-are not grouped/joined correctly?
+### My program does not compute the correct result. Why are my custom key types not grouped/joined correctly?
 
 Keys must correctly implement the methods `java.lang.Object#hashCode()`,
 `java.lang.Object#equals(Object o)`, and `java.util.Comparable#compareTo(...)`.