fix conflict
Project: http://git-wip-us.apache.org/repos/asf/spark-website/repo Commit: http://git-wip-us.apache.org/repos/asf/spark-website/commit/09046892 Tree: http://git-wip-us.apache.org/repos/asf/spark-website/tree/09046892 Diff: http://git-wip-us.apache.org/repos/asf/spark-website/diff/09046892 Branch: refs/heads/asf-site Commit: 09046892bf9702dbb48c2b325e05e7c4091164ea Parents: 3c96a50 Author: Stan Zhai <zhaishi...@haizhi.com> Authored: Tue Apr 25 15:18:47 2017 +0800 Committer: Stan Zhai <zhaishi...@haizhi.com> Committed: Tue Apr 25 15:18:47 2017 +0800 ---------------------------------------------------------------------- site/developer-tools.html | 49 +----------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark-website/blob/09046892/site/developer-tools.html ---------------------------------------------------------------------- diff --git a/site/developer-tools.html b/site/developer-tools.html index 680e089..d6c4169 100644 --- a/site/developer-tools.html +++ b/site/developer-tools.html @@ -304,7 +304,6 @@ $ build/mvn package -DskipTests -pl core <pre><code>build/mvn test -DwildcardSuites=none -Dtest=org.apache.spark.streaming.JavaAPISuite test </code></pre> -<<<<<<< HEAD <h3>ScalaTest Issues</h3> <p>If the following error occurs when running ScalaTest</p> @@ -337,7 +336,7 @@ your pull request to change testing behavior. This includes:</p> <li><code>[test-maven]</code> - signals to test the pull request using maven</li> <li><code>[test-hadoop2.7]</code> - signals to test using Spark’s Hadoop 2.7 profile</li> </ul> -======= + <h3>Binary compatibility</h3> <p>To ensure binary compatibility, Spark uses <a href="https://github.com/typesafehub/migration-manager";>MiMa</a>.</p> @@ -386,7 +385,6 @@ JIRA number of the issue you’re working on as well as its title.</p> updating your pull request. Usually, the problems reported by MiMa are self-explanatory and revolve around missing members (methods or fields) that you will have to add back in order to maintain binary compatibility.</p> ->>>>>>> aa1c66e424e024cb2e9f962aae8952bb4ad75cb5 <h3>Checking Out Pull Requests</h3> @@ -428,51 +426,6 @@ $ build/mvn -DskipTests install $ build/mvn dependency:tree </code></pre> -<<<<<<< HEAD -======= -<p><a name="individual-tests"></a></p> -<h3>Running Build Targets For Individual Projects</h3> - -<pre><code>$ # sbt -$ build/sbt package -$ # Maven -$ build/mvn package -DskipTests -pl assembly -</code></pre> - -<h3>ScalaTest Issues</h3> - -<p>If the following error occurs when running ScalaTest</p> - -<pre><code>An internal error occurred during: "Launching XYZSuite.scala". -java.lang.NullPointerException -</code></pre> -<p>It is due to an incorrect Scala library in the classpath. To fix it:</p> - -<ul> - <li>Right click on project</li> - <li>Select <code>Build Path | Configure Build Path</code></li> - <li><code>Add Library | Scala Library</code></li> - <li>Remove <code>scala-library-2.10.4.jar - lib_managed\jars</code></li> -</ul> - -<p>In the event of “Could not find resource path for Web UI: org/apache/spark/ui/static”, -it’s due to a classpath issue (some classes were probably not compiled). To fix this, it is -sufficient to run a test from the command line:</p> - -<pre><code>build/sbt "test-only org.apache.spark.rdd.SortingSuite" -</code></pre> - -<h3>Running Different Test Permutations on Jenkins</h3> - -<p>When running tests for a pull request on Jenkins, you can add special phrases to the title of -your pull request to change testing behavior. This includes:</p> - -<ul> - <li><code>[test-maven]</code> - signals to test the pull request using maven</li> - <li><code>[test-hadoop2.7]</code> - signals to test using Spark’s Hadoop 2.7 profile</li> -</ul> - ->>>>>>> aa1c66e424e024cb2e9f962aae8952bb4ad75cb5 <h3>Organizing Imports</h3> <p>You can use a <a href="https://plugins.jetbrains.com/plugin/7350";>IntelliJ Imports Organizer</a> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
